delete .rej

2017-05-21 00:45:55 -05:00
parent 186ed2acbb
commit d8299bdcfd
3 changed files with 2 additions and 24 deletions
@@ -1,10 +0,0 @@
-diff a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm	(rejected hunks)
-@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(vote)
- 					restart = 1
- 			if("gamemode")
- 				if(GLOB.master_mode != .)
-					world.save_mode(.)
-+					SSticker.save_mode(.)
- 					if(SSticker.HasRoundStarted())
- 						restart = 1
- 					else