From 2b84f4948e3b94787894039a827dba490abad38f Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Tue, 20 Jul 2021 19:32:58 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/surgery/organs_internal.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 62d39f3c48..e5f49cc922 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -14,12 +14,7 @@
 		return 0
 	return affected && affected.open == (affected.encased ? 3 : 2)
 
-<<<<<<< HEAD
-//CHOMPedit. Removed unused embryo surgery
-||||||| parent of eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
-=======
 //Removed unused Embryo Surgery, derelict and broken.
->>>>>>> eb76662be1... Merge pull request #11112 from MisterGrimm/XenomorphOverhaul
 
 //////////////////////////////////////////////////////////////////
 //				CHEST INTERNAL ORGAN SURGERY					//