# Conflicts:

# core/src/mindustry/mod/ClassMap.java
2021-06-15 19:29:12 -04:00
parent ac111677c0
commit eed91eaaa0
72 changed files with 820 additions and 704 deletions
--- a/servers_be.json
+++ b/servers_be.json
@@ -13,8 +13,5 @@
  },
  {
    "address": "mindurka.tk:9999"
-  },
-  {
-    "address": "mindustrypvp.ml:6000"
  }
 ]