From a6220057bea038c015630c8ecf9cdf90ab1770d3 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 13 Dec 2017 16:47:29 -0500
Subject: [PATCH] Update filingcabinet.dm

---
 code/modules/paperwork/filingcabinet.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index d1641d8add..0d963d4be8 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -184,12 +184,8 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
 	icon_state = "employmentcabinet"
 	var/virgin = 1
 
-<<<<<<< HEAD
-/obj/structure/filingcabinet/employment/New()
-=======
 /obj/structure/filingcabinet/employment/Initialize()
 	. = ..()
->>>>>>> a162837... Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
 	GLOB.employmentCabinets += src
 	return ..()