support for tgs4 noconfigs needed***

2021-03-03 17:33:14 +08:00
parent 754c24748e
commit a87e4533e5
20 changed files with 239 additions and 157 deletions
@@ -642,10 +642,6 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if (!server_url)
 		CRASH("Invalid cross comms config: [server_name]")
 	world.Export("[server_url]?[list2params(message)]")
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master

 /proc/ircadminwho()
 	var/list/message = list("Admins: ")