Update Server Versions

MineYourMind · May 4, 2022 · f117f6f · f117f6f
1 parent 7b5951a
commit f117f6f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docs/source/Server_Ips/server_ips_1_12.rst b/docs/source/Server_Ips/server_ips_1_12.rst
@@ -10,13 +10,8 @@ Server Ip's 1.12.2
 
 Antimatter Chemistry
 ^^^^^^^^^^^^^^^^^^^^
-<<<<<<< HEAD
 Version - ``1.2.36h``
 ---------------------
-=======
-Version - ``1.2.35``
---------------------
->>>>>>> 15833ba71ee3a4e689b405a97e9b41ef11462a9f
 
 * **Node 1:** ``antimatter.mineyourmind.net``