1 files changed, 1 insertions, 4 deletions
diff --git a/index.html b/index.html
index 42beeff..9031a9e 100644
--- a/index.html
+++ b/index.html
@@ -114,16 +114,13 @@
             <li><a href="https://btcpayserver.org/">BTCPay</a></li>
             <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>
->>>>>>> 4aa7add2b1eaaa4561d5aa43df37bcb991bd73c8
         </ul>