Update traits.dm

2018-03-02 21:27:56 -05:00
parent 0a449af83e
commit 02b9f290dd
1 changed files with 0 additions and 3 deletions
@@ -24,8 +24,6 @@
 #define TRAIT_ANTIMAGIC			"anti_magic"
 #define TRAIT_HOLY				"holy"

-<<<<<<< HEAD
-=======
 #define TRAIT_ALCOHOL_TOLERANCE	"alcohol_tolerance"
 #define TRAIT_AGEUSIA			"ageusia"
 #define TRAIT_HEAVY_SLEEPER		"heavy_sleeper"
@@ -38,7 +36,6 @@
 #define TRAIT_SKITTISH			"skittish"
 #define TRAIT_POOR_AIM			"poor_aim"
 #define TRAIT_PROSOPAGNOSIA		"prosopagnosia"
->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)

 // common trait sources
 #define TRAIT_GENERIC "generic"