index.html

@@ -28,7 +28,6 @@ There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_o
 
 You can also visit us over The Onion Routing protocol at <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">our onion address.</a>
 
-Contribute: <a href="git.html">/git</a>
 
 Donts:
 ======
@@ -57,9 +56,6 @@ Communcations:
 Services:
 ---------
 
-<<<<<<< HEAD
-<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search</a>
-=======
 <a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search </a> | <a href="https://party.lysergic.dev"> Cytube - Watch together</a>
 
 
@@ -76,7 +72,6 @@ Services:
 <footer>
   <a href="mailto:hello@liberta.casa"> Contact </a> 
 </footer>
->>>>>>> master
 </pre>
 </body>
-</html>
+</html>