summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratyush Desai2021-08-07 09:09:25 +0530
committerPratyush Desai2021-08-07 09:09:25 +0530
commitc730c70d609f3158b6a3226667a53296e2bf606e (patch)
treedce85eccdfbcbb871952a8e686e4fc4c3756f047
parent3fb489fbd402f749d0c0b5359fc6dac00c84c2af (diff)
downloadwebsite-devel_git.tar.gz
website-devel_git.tar.bz2
website-devel_git.zip
fix indexdevel_git
-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>