Merge tag 'v0.10.4' into stable

[github/shaarli/Shaarli.git] / application / Updater.php

diff --git a/application/Updater.php b/application/Updater.php
index 6b94c5e34af485e8327628206cb9c19aa6c6f7f7..86a21fc39b6c701cd33d9ea3b4649f30ef020f50 100644 (file)
--- 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()