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 @@
  • Matrix
  • XMPP
  • -<<<<<<< HEAD

    Services

    You can get access to the "Reg Needed" services by signing up via the registration form.

    With the exception of clearnet Minetest & services hosted on Iceberg, 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.

    @@ -48,8 +47,6 @@

    What computers do ~vern servers run on?

    ~vern has many servers running in different ways. You can find a list of them and their uses at /sysinfo.

    -======= ->>>>>>> df9be37828498af9c9e23f59f8891ffcf0d97bcf