X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2FUpdater.php;h=86a21fc39b6c701cd33d9ea3b4649f30ef020f50;hb=38672ba0d1c722e5d6d33a58255ceb55e9410e46;hp=6b94c5e34af485e8327628206cb9c19aa6c6f7f7;hpb=1e77e0448bbd25675d8c0fe4a73206ad9048904b;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/Updater.php b/application/Updater.php
index 6b94c5e3..86a21fc3 100644
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -256,6 +256,8 @@ class Updater
     }
 
     /**
+<<<<<<< HEAD
+=======
      * Rename tags starting with a '-' to work with tag exclusion search.
      */
     public function updateMethodRenameDashTags()