3 files changed, 8 insertions, 1 deletions

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()
diff --git a/index.php b/index.php
index 4deed197..27c67ce1 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,12 @@
 <?php
 /**
+<<<<<<< HEAD
+ * Shaarli v0.8.7 - Shaare your links...
+ *
+ * The personal, minimalist, super-fast, database free, bookmarking service.
+=======
  * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service.
+>>>>>>> v0.9.7
  *
  * Friendly fork by the Shaarli community:
  *  - https://github.com/shaarli/Shaarli
diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index c4a6e7ef..608e331d 100644
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -503,7 +503,6 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertFalse($this->conf->get('security.markdown_escape'));
     }
 
-
     /**
      * Test updateMethodEscapeMarkdown with markdown plugin disabled
      * => setting markdown_escape set to true.