From 521fba608dc3df3e14b92996e9f391bb9ff136ca Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 5 Sep 2016 18:33:03 -0400
Subject: [PATCH] how did I miss that. Derp

---
 code/game/machinery/cloning.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 012b992b357..f07cd94438d 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -118,7 +118,6 @@
 	name = "data disk - 'God Emperor of Mankind'"
 	read_only = 1
 
-<<<<<<< HEAD
 /obj/item/weapon/disk/data/demo/New()
 	Initialize()
 	buf.types=DNA2_BUF_UE|DNA2_BUF_UI