Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #901 from shaarli/fix-900

Browse source 
Remove merge conflict leftover
This commit is contained in:
nodiscc 2017-07-19 18:54:00 +02:00 committed by GitHub
commit 96f70777f7
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tpl/default/page.footer.html
View file

@ -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}