Merge tag 'v0.9.7' into stable

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

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