Merge pull request #901 from shaarli/fix-900

Remove merge conflict leftover

1 files changed, 1 insertions, 11 deletions

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index 84f13612..94f771a2 100644
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
-=======
-<div id="footer">
-  <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
-  - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community
-  - <a href="doc/html/index.html" rel="nofollow">Help/documentation</a>
-    {loop="$plugins_footer.text"}
-        {$value}
-    {/loop}
->>>>>>> Generate HTML documentation using MkDocs (WIP)
 </div>
 
 <div class="pure-g">
@@ -19,7 +9,7 @@
     {/if}
     &middot;
     The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community &middot;
-    <a href="doc/Home.html" rel="nofollow">Documentation</a>
+    <a href="doc/html/index.html" rel="nofollow">Documentation</a>
       {loop="$plugins_footer.text"}
           {$value}
       {/loop}