From: nodiscc <nodiscc@gmail.com>
Date: Tue, 11 Jul 2017 12:30:14 +0000 (+0200)
Subject: Remove merge conflict leftover
X-Git-Tag: v0.9.1~1^2~17^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=a5fbc689f8989ffd1181af4530a932dd0f1ed76b;hp=70cb883547a04b3ccd3fda567d15541d124a3f41;p=github%2Fshaarli%2FShaarli.git

Remove merge conflict leftover

Fixes #900
---

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}