From b79fdf0839bef4760624bd59b75f01d38d9323eb Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Jun 2017 23:21:33 -0500 Subject: [PATCH] Delete tgstation.dme.rej --- tgstation.dme.rej | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 tgstation.dme.rej diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index 286f35ef42..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -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"