From d820575f783cf2a177a264ded8bf2e9381ddc2c4 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 29 Dec 2017 18:41:57 -0600
Subject: [PATCH] Update orbit.dm

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

diff --git a/code/modules/orbit/orbit.dm b/code/modules/orbit/orbit.dm
index 913b552a55..540e0cf7d5 100644
--- a/code/modules/orbit/orbit.dm
+++ b/code/modules/orbit/orbit.dm
@@ -57,12 +57,8 @@
 	lastloc = orbiter.loc
 	for(var/other_orbit in orbiter.orbiters)
 		var/datum/orbit/OO = other_orbit
-<<<<<<< HEAD
-		if(OO == src)
-=======
 		//Skip if checked already
 		if(checked_already[OO])
->>>>>>> 23d33a3... Merge pull request #33914 from optimumtact/thegreatestshow
 			continue
 		OO.Check(targetloc, checked_already)