From f123dae8d7863d63170a0a26d8cfbd498dcbd38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vitor=20Gon=C3=A7alves?= <vitorg@tilde.team>
Date: Fri, 19 May 2023 15:59:25 -0300
Subject: [PATCH] remove line 42 and 51 (idk what fucking happened there)

---
 en/index.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/en/index.html b/en/index.html
index ac5cc92..b437d79 100644
--- a/en/index.html
+++ b/en/index.html
@@ -39,7 +39,6 @@
 		<li><a href='//mto.vern.cc/#/#abuse:vern.cc' target="_blank">Matrix</a></li>
 		<li><a href="xmpp:abuse@muc.vern.cc" target="_blank">XMPP</a></li>
 	</ul>
-<<<<<<< HEAD
 	<div class=h><h2 id=services>Services</h2> <a aria-hidden=true href=#services>#services</a></div>
 	<p>You can get access to the "Reg Needed" services by <a href=/en/register>signing up</a> via the registration form.</p>
 	<p>With the exception of clearnet Minetest &amp; services hosted on <a href=/en/sysinfo#iceberg>Iceberg</a>, none of the services we host have the capability to log IP addresses due to our use of WireGuard. IP logging on Iceberg is disabled.</p>
@@ -48,8 +47,6 @@
 	<!--#include file="services.html" -->
 	<div class=h><h2 id=sysinfo>What computers do ~vern servers run on?</h2> <a aria-hidden=true href=#sysinfo>#sysinfo</a></div>
 	<p>~vern has many servers running in different ways. You can find a list of them and their uses at <a href=/en/sysinfo>/sysinfo</a>.</p>
-=======
->>>>>>> df9be37828498af9c9e23f59f8891ffcf0d97bcf
 	<!--#include file="footer.cgi" -->
 </body>
 </html>