Merge branch 'reflex229-master'

calibre.html

@@ -32,12 +32,6 @@ mkdir /opt/calibre</code></pre>
 
         <p>
             Either upload your existing library using <code>rsync</code>. For example to <code>/opt/calibre/</code>.
-        </p>
-
-        <p>
-            On client:
-        </p>
-
         <pre><code>cd ~/Documents
 rsync -avuP <strong>your-library-dir</strong> root@<strong>example.org</strong>:/opt/calibre/</code></pre>
 

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>