Fix merge conflict in servers.json
This commit is contained in:
commit
dbbf225dea
14
servers.json
14
servers.json
@ -63,7 +63,7 @@
|
||||
"name": "Kohi",
|
||||
"ip": "kohi.us",
|
||||
"type": "PC",
|
||||
"category": "midsized"
|
||||
"category": "major"
|
||||
},
|
||||
{
|
||||
"name": "Wynncraft",
|
||||
@ -107,12 +107,6 @@
|
||||
"type": "PC",
|
||||
"category": "midsized"
|
||||
},
|
||||
{
|
||||
"name": "TheArchon",
|
||||
"ip": "pvp.thearchon.net",
|
||||
"type": "PC",
|
||||
"category": "midsized"
|
||||
},
|
||||
{
|
||||
"name": "GotPvP",
|
||||
"ip": "play.gotpvp.com",
|
||||
@ -149,12 +143,6 @@
|
||||
"type": "PC",
|
||||
"category": "small"
|
||||
},
|
||||
{
|
||||
"name": "GommeHD",
|
||||
"ip": "gommehd.net",
|
||||
"type": "PC",
|
||||
"category": "major"
|
||||
},
|
||||
{
|
||||
"name": "Island Clash",
|
||||
"ip": "play.islandclash.com",
|
||||
|
Loading…
x
Reference in New Issue
Block a user