From 19fa1066d9882510c33a32d1022dfb513602326a Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 19 Jan 2018 08:48:40 -0500
Subject: [PATCH] Update AI_modules.dm

---
 code/game/objects/items/AI_modules.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index 9ae52842b1..512d1fe9b2 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -398,13 +398,8 @@ AI MODULES
 /obj/item/aiModule/core/full/custom
 	name = "Default Core AI Module"
 
-<<<<<<< HEAD
-/obj/item/aiModule/core/full/custom/New()
-	..()
-=======
 /obj/item/aiModule/core/full/custom/Initialize()
 	. = ..()
->>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
 	for(var/line in world.file2list("config/silicon_laws.txt"))
 		if(!line)
 			continue