fix index

Merge pull request 'Adding git.html' (#11 ) from devel_git into master
Reviewed-on: #11 good luck!
2021-08-07 09:09:25 +05:30 · 2021-08-07 05:35:03 +02:00
1 changed files with 0 additions and 4 deletions
--- 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>
Author	SHA1	Message	Date
Pratyush Desai	c730c70d60	fix index	2021-08-07 09:09:25 +05:30
Pratyush Desai	3fb489fbd4	Merge pull request 'Adding git.html' (#11 ) from devel_git into master Reviewed-on: #11 good luck!	2021-08-07 05:35:03 +02:00