Update stat.dm

2017-12-17 15:54:52 -06:00
parent 962f135957
commit 99a173b187
1 changed files with 0 additions and 5 deletions
@@ -18,14 +18,9 @@
 #define HUSK		64
 #define NOCLONE		128
 #define CLUMSY		256
-<<<<<<< HEAD
-#define DUMB		512
-#define MONKEYLIKE	1024 //sets IsAdvancedToolUser to FALSE
-=======
 #define DUMB        512
 #define MONKEYLIKE  1024 //sets IsAdvancedToolUser to FALSE
 #define PACIFISM 	2048
->>>>>>> b5d9845... [Ready]Brain Trauma additions (#33405)

 // bitflags for machine stat variable
 #define BROKEN		1