cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source 
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
This commit is contained in:
DZD
2015-07-15 22:28:12 -04:00
parent edcda83edc e55af53edb
commit 29e70854e9
88 changed files with 2338 additions and 3634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+1 -1
View File
@@ -49,7 +49,7 @@ datum/controller/game_controller/New()
if(master_controller != src)
if(istype(master_controller))
Recover()
qdel(master_controller)
del(master_controller)
master_controller = src
if(!job_master)