Generate HTML documentation using MkDocs (WIP)

[github/shaarli/Shaarli.git] / tpl / default / page.footer.html

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index 02fc76428e3110420f6d284cec6e7151b65a24ba..84f136122db3c1bafa4c418f229ac23bd48062ef 100644 (file)
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,3 +1,13 @@
+<<<<<<< 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">