Update world.dm

code/game/world.dm

@@ -57,17 +57,8 @@
 	// Create robolimbs for chargen.
 	populate_robolimb_list()
 
-<<<<<<< HEAD
-	//Must be done now, otherwise ZAS zones and lighting overlays need to be recreated.
-	//createRandomZlevel()	//VOREStation Removal: Deprecated
-
-	master_controller = new /datum/controller/game_controller()
-
-	Master.Initialize(10, FALSE, TRUE)
-=======
 	master_controller = new /datum/controller/game_controller()
 	Master.Initialize(10, FALSE)
->>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched
 
 	spawn(1)
 		master_controller.setup()
@@ -413,10 +404,6 @@ var/world_topic_spam_protect_time = world.timeofday
 			to_world("<span class='boldannounce'>Rebooting world immediately due to host request</span>")
 	else
 		Master.Shutdown()	//run SS shutdowns
-<<<<<<< HEAD
-		//processScheduler.stop() //VOREStation Removal
-=======
->>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched
 		for(var/client/C in GLOB.clients)
 			if(config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
 				C << link("byond://[config.server]")