Delete misc.dm.rej

2017-05-27 13:41:18 -07:00
parent 62a7537030
commit 0093c4a03d
1 changed files with 0 additions and 8 deletions
@@ -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