From 9ccdb75e5757eec0ac518c034cf6cf297398641b Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 18 Dec 2017 17:23:52 -0600
Subject: [PATCH] Update stat.dm

---
 code/__DEFINES/stat.dm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index 208970ff9f..ce84d27765 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -10,18 +10,6 @@
 
 //mob disabilities stat
 
-<<<<<<< HEAD
-#define BLIND 		1
-#define MUTE		2
-#define DEAF		4
-#define NEARSIGHT	8
-#define FAT			32
-#define HUSK		64
-#define NOCLONE		128
-#define CLUMSY		256
-#define DUMB		512
-#define MONKEYLIKE	1024 //sets IsAdvancedToolUser to FALSE
-=======
 #define BLIND 		"blind"
 #define MUTE		"mute"
 #define DEAF		"deaf"
@@ -44,7 +32,6 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_DISABILITY "trauma"
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 
 // bitflags for machine stat variable
 #define BROKEN		1