From 02b9f290dd53cca545f502aba8702ca42fd0c69b Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 2 Mar 2018 21:27:56 -0500
Subject: [PATCH] Update traits.dm

---
 code/__DEFINES/traits.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 11004205c6..248d854dcb 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -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"