2 files changed, 4 insertions, 2 deletions

diff --git a/application/bookmark/LinkDB.php b/application/bookmark/LinkDB.php
index efde8468..76ba95f0 100644
--- a/application/bookmark/LinkDB.php
+++ b/application/bookmark/LinkDB.php
@@ -102,7 +102,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess
         $isLoggedIn,
         $hidePublicLinks
     ) {
-    
+
         $this->datastore = $datastore;
         $this->loggedIn = $isLoggedIn;
         $this->hidePublicLinks = $hidePublicLinks;
@@ -415,7 +415,7 @@ You use the community supported version of the original Shaarli project, by Seba
         $visibility = 'all',
         $untaggedonly = false
     ) {
-    
+
         // Filter link database according to parameters.
         $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : '';
         $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : '';
diff --git a/application/updater/Updater.php b/application/updater/Updater.php
index beb9ea9b..30e5247b 100644
--- a/application/updater/Updater.php
+++ b/application/updater/Updater.php
@@ -268,6 +268,8 @@ class Updater
     }
 
     /**
+<<<<<<< HEAD
+=======
      * Rename tags starting with a '-' to work with tag exclusion search.
      */
     public function updateMethodRenameDashTags()