From 38f7b829c3cc7040779b79a661d7ccb036886740 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 17 Nov 2017 23:20:44 -0500
Subject: [PATCH] Update manifest.dm

---
 code/game/objects/effects/manifest.dm | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/code/game/objects/effects/manifest.dm b/code/game/objects/effects/manifest.dm
index 4f60b12a94..2082f2b495 100644
--- a/code/game/objects/effects/manifest.dm
+++ b/code/game/objects/effects/manifest.dm
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/manifest
-	name = "manifest"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x"
-
-/obj/effect/manifest/New()
-	src.invisibility = INVISIBILITY_ABSTRACT
-
-/obj/effect/manifest/proc/manifest()
-	var/dat = "<B>Crew Manifest</B>:<BR>"
-	for(var/mob/living/carbon/human/M in GLOB.mob_list)
-		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
-	var/obj/item/paper/P = new /obj/item/paper( src.loc )
-	P.info = dat
-	P.name = "paper- 'Crew Manifest'"
-	//SN src = null
-	qdel(src)
-=======
 /obj/effect/manifest
 	name = "manifest"
 	icon = 'icons/mob/screen_gen.dmi'
@@ -34,4 +15,3 @@
 	P.name = "paper- 'Crew Manifest'"
 	//SN src = null
 	qdel(src)
->>>>>>> 39375d5... Replaces a bunch of mob loops with hopefully better ones (#32786)