From 963ca2ca79f8500ff719c43a563ab1e6db437c8f Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Mon, 11 Jul 2016 13:06:40 -0400
Subject: [PATCH] ACTUALLY Resolves The Merge Conflicts (Remember To Save,
 Kids)

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

diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index fc874959cff..d44fed0cb05 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -122,12 +122,9 @@
 #define NUTRITION_LEVEL_FED 350
 #define NUTRITION_LEVEL_HUNGRY 250
 #define NUTRITION_LEVEL_STARVING 150
-<<<<<<< HEAD
-=======
 
 //Used for calculations for negative effects of having genetics powers
 #define DEFAULT_GENE_STABILITY 100
 #define GENE_INSTABILITY_MINOR 5
 #define GENE_INSTABILITY_MODERATE 10
 #define GENE_INSTABILITY_MAJOR 15
->>>>>>> 26e13f270f62f6104106ed087a318469ad4d9d02