From 0093c4a03ddf3e5f01092924f8b4f83e0c45df33 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 27 May 2017 13:41:18 -0700 Subject: [PATCH] Delete misc.dm.rej --- code/__DEFINES/misc.dm.rej | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 code/__DEFINES/misc.dm.rej diff --git a/code/__DEFINES/misc.dm.rej b/code/__DEFINES/misc.dm.rej deleted file mode 100644 index 1697c2fdce..0000000000 --- a/code/__DEFINES/misc.dm.rej +++ /dev/null @@ -1,8 +0,0 @@ -diff a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm (rejected hunks) -@@ -411,4 +424,4 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE - #define GIBTONITE_UNSTRUCK 0 - #define GIBTONITE_ACTIVE 1 - #define GIBTONITE_STABLE 2 --#define GIBTONITE_DETONATE 3 -\ No newline at end of file -+#define GIBTONITE_DETONATE 3