aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2017-07-11 14:30:14 +0200
committerGitHub <noreply@github.com>2017-07-11 14:30:14 +0200
commita5fbc689f8989ffd1181af4530a932dd0f1ed76b (patch)
tree2663ef76c35ac0124b5af0051de97b4aabeb80d1 /tpl
parent70cb883547a04b3ccd3fda567d15541d124a3f41 (diff)
downloadShaarli-a5fbc689f8989ffd1181af4530a932dd0f1ed76b.tar.gz
Shaarli-a5fbc689f8989ffd1181af4530a932dd0f1ed76b.tar.zst
Shaarli-a5fbc689f8989ffd1181af4530a932dd0f1ed76b.zip
Remove merge conflict leftover
Fixes #900
Diffstat (limited to 'tpl')
-rw-r--r--tpl/default/page.footer.html12
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 @@
1<<<<<<< HEAD
2=======
3<div id="footer">
4 <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong>
5 - The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community
6 - <a href="doc/html/index.html" rel="nofollow">Help/documentation</a>
7 {loop="$plugins_footer.text"}
8 {$value}
9 {/loop}
10>>>>>>> Generate HTML documentation using MkDocs (WIP)
11</div> 1</div>
12 2
13<div class="pure-g"> 3<div class="pure-g">
@@ -19,7 +9,7 @@
19 {/if} 9 {/if}
20 &middot; 10 &middot;
21 The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community &middot; 11 The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community &middot;
22 <a href="doc/Home.html" rel="nofollow">Documentation</a> 12 <a href="doc/html/index.html" rel="nofollow">Documentation</a>
23 {loop="$plugins_footer.text"} 13 {loop="$plugins_footer.text"}
24 {$value} 14 {$value}
25 {/loop} 15 {/loop}