fix

2019-09-22 19:20:05 -05:00
parent 4b36e6263e
commit 81bb4b4c31
7 changed files with 13 additions and 14 deletions
@@ -190,7 +190,6 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define EYES_COVERED "eyes_covered"
-<<<<<<< HEAD
 #define CULT_TRAIT "cult"
 #define CLOWN_NUKE_TRAIT "clown-nuke"
 #define STICKY_MOUSTACHE_TRAIT "sticky-moustache"