From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 29 Jun 2016 18:52:37 +0000 (+0200)
Subject: fix merge issue
X-Git-Tag: 2.1.0~65^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4f0558a0d43b3d0bbd661c06568257a91836fa91;p=github%2Fwallabag%2Fwallabag.git

fix merge issue
---

diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 8d2ec9ce..b543c5ae 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -111,7 +111,8 @@ class EntryRepository extends EntityRepository
 
         if ($since >= 0) {
             $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
-            
+        }
+
         if ('' !== $tags) {
             foreach (explode(',', $tags) as $tag) {
                 $qb->andWhere('t.label = :label')->setParameter('label', $tag);