summaryrefslogtreecommitdiffstats
path: root/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'index.html')
-rw-r--r--index.html4
1 files changed, 0 insertions, 4 deletions
diff --git a/index.html b/index.html
index 9e559e8..7280670 100644
--- a/index.html
+++ b/index.html
@@ -57,9 +57,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 +73,6 @@ Services:
<footer>
<a href="mailto:hello@liberta.casa"> Contact </a>
</footer>
->>>>>>> master
</pre>
</body>
</html>