From 95a0c8f7e3396e632fd2e59aeefc306822bef725 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 5 Feb 2014 22:53:46 -0500
Subject: [PATCH] compile fix

---
 code/modules/mob/living/living_defense.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 790b93dc1b6..abc51b30d93 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -134,7 +134,6 @@
 	return 0
 
 // End BS12 momentum-transfer code.
-<<<<<<< HEAD
 
 //Mobs on Fire
 /mob/living/proc/IgniteMob()
@@ -173,5 +172,3 @@
 		IgniteMob()
 
 //Mobs on Fire end
-=======
->>>>>>> 9665e8c... Mouse Attack_Logs disabled.  Admins rejoice.