Update orbit.dm

2017-12-29 18:41:57 -06:00
parent 0b9ffdd3e3
commit d820575f78
1 changed files with 0 additions and 4 deletions
--- 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)