Merge tag 'v0.10.4' into stable

[github/shaarli/Shaarli.git] / index.php

diff --git a/index.php b/index.php
index 4deed1975f23ee6d73455e7b08cba573dbcac1cb..27c67ce1a7f16935ba1916442fe12614dde1933b 100644 (file)
--- 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