Delete tgstation.dme.rej

This commit is contained in:
LetterJay
2017-06-26 23:21:33 -05:00
committed by GitHub
parent 039dcb464f
commit b79fdf0839

View File

@@ -1,12 +0,0 @@
diff a/tgstation.dme b/tgstation.dme (rejected hunks)
@@ -240,9 +240,9 @@
#include "code\datums\antagonists\antag_datum.dm"
#include "code\datums\antagonists\datum_clockcult.dm"
#include "code\datums\antagonists\datum_cult.dm"
-#include "code\datums\antagonists\devil.dm"
#include "code\datums\antagonists\datum_internal_affairs.dm"
#include "code\datums\antagonists\datum_traitor.dm"
+#include "code\datums\antagonists\devil.dm"
#include "code\datums\antagonists\ninja.dm"
#include "code\datums\diseases\_disease.dm"
#include "code\datums\diseases\_MobProcs.dm"