diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index 0f6ea014d0..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -657,8 +657,8 @@ - #include "code\game\objects\effects\mines.dm" - #include "code\game\objects\effects\misc.dm" - #include "code\game\objects\effects\overlays.dm" --#include "code\game\objects\effects\proximity.dm" - #include "code\game\objects\effects\portals.dm" -+#include "code\game\objects\effects\proximity.dm" - #include "code\game\objects\effects\spiders.dm" - #include "code\game\objects\effects\step_triggers.dm" - #include "code\game\objects\effects\wanted_poster.dm"