1 files changed, 8 insertions, 0 deletions
diff --git a/index.html b/index.html
index f20be26..b310fca 100644
--- a/index.html
+++ b/index.html
@@ -66,6 +66,7 @@
             <li><a href="gitea.html">Setting up <img src="pix/gitea.svg">Gitea</a></li>
             <li><a href="irc.html">Creating your own chat server with <img src="pix/irc.svg">IRC</a></li>
             <li><a href="rss-bridge.html">RSS Bridge: Create RSS Feeds for Mainstream Social Media</a></li>
+            <li><a href="calibre.html">Setting up a Calibre library server</a></li>
         </ul>
 
         <h3 id=crypto>Accepting Cryptocurrency Tips</h3>
@@ -109,10 +110,17 @@
         <ul>
             <li>Email webclients</li>
             <li>Simple static site generators</li>
+<<<<<<< HEAD
             <li>Calibre (library server)</li>
             <li><a href="https://joinpeertube.org/">PeerTube</a> (like YouTube)</li>
             <li><a href="https://www.ejabberd.im/">XMPP ejabberd</a></li>
             <li><a href="https://movim.eu/">Movim for XMPP</a></li>
+=======
+            <li>Nitter</li>
+            <li>PeerTube (like YouTube)</li>
+            <li>XMPP ejabberd</li>
+            <li>Movim for XMPP</li>
+>>>>>>> 0d8a7cc8c787fe15bdab6266f5f9fb50edae27a0
         </ul>