Update DNA.dm

2017-12-06 13:26:43 -05:00
parent b1852a8c1f
commit f768647ac6
1 changed files with 0 additions and 5 deletions
@@ -69,7 +69,6 @@
 #define DNA_GENDER_BLOCK			5
 #define DNA_FACIAL_HAIR_STYLE_BLOCK	6
 #define DNA_HAIR_STYLE_BLOCK		7
-<<<<<<< HEAD
 #define DNA_EYE_COLOR_TWO_BLOCK		8
 #define DNA_EYE_COLOR_SWITCH_BLOCK	9
 #define DNA_EYE_COLOR_BLOCK			10
@@ -83,11 +82,7 @@
 #define DNA_MUTANTTAIL_BLOCK		17
 #define DNA_MUTANTWING_BLOCK		18
 #define DNA_WINGCOLOR_BLOCK			19
-#define DNA_STRUC_ENZYMES_BLOCKS	19
-=======
-
 #define DNA_STRUC_ENZYMES_BLOCKS	18
->>>>>>> 550d711... Brain Traumas (#31727)
 #define DNA_UNIQUE_ENZYMES_LEN		32

 //Transformation proc stuff