From 208e6ee06d25b1693c3f03bb12f3875c95b7475a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 27 Feb 2021 13:31:02 -0500
Subject: [PATCH] Update objs.dm

---
 code/game/objects/objs.dm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index d1d5146c2a0..0bf22938021 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -24,21 +24,7 @@
 	STOP_PROCESSING(SSobj, src)
 	return ..()
 
-<<<<<<< HEAD
-/obj/Moved(atom/oldloc)
-	. = ..()
-	if(register_as_dangerous_object)
-		var/turf/old_turf = get_turf(oldloc)
-		var/turf/new_turf = get_turf(src)
-
-		if(old_turf != new_turf)
-			old_turf.unregister_dangerous_object(src)
-			new_turf.register_dangerous_object(src)
-
 /obj/Topic(href, href_list, var/datum/tgui_state/state = GLOB.tgui_default_state)
-=======
-/obj/Topic(href, href_list, var/datum/topic_state/state = default_state)
->>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
 	if(usr && ..())
 		return 1