Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix merge conflict in servers.json

Browse Source
This commit is contained in:
Cryptkeeper 2016-02-23 16:17:39 -06:00
commit dbbf225dea
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers.json
View File

@ -63,7 +63,7 @@
"name": "Kohi", "name": "Kohi",
"ip": "kohi.us", "ip": "kohi.us",
"type": "PC", "type": "PC",
"category": "midsized" "category": "major"
}, },
{ {
"name": "Wynncraft", "name": "Wynncraft",
@ -107,12 +107,6 @@
"type": "PC", "type": "PC",
"category": "midsized" "category": "midsized"
}, },
{
"name": "TheArchon",
"ip": "pvp.thearchon.net",
"type": "PC",
"category": "midsized"
},
{ {
"name": "GotPvP", "name": "GotPvP",
"ip": "play.gotpvp.com", "ip": "play.gotpvp.com",
@ -149,12 +143,6 @@
"type": "PC", "type": "PC",
"category": "small" "category": "small"
}, },
{
"name": "GommeHD",
"ip": "gommehd.net",
"type": "PC",
"category": "major"
},
{ {
"name": "Island Clash", "name": "Island Clash",
"ip": "play.islandclash.com", "ip": "play.islandclash.com",