Merge branch 'v0.11' into stable

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

diff --git a/application/updater/Updater.php b/application/updater/Updater.php
index beb9ea9b7517613cd9c2ca01c884ba239f250355..30e5247bc43dab93c7a5c4afb42a96541d04404a 100644 (file)
--- 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()