Update shuttle.dm

2017-11-02 02:21:40 -05:00
parent a9f07518a7
commit d0c1964181
1 changed files with 0 additions and 3 deletions
@@ -655,12 +655,9 @@
 		new_parallax_dir = preferred_direction
 	for(var/i in 1 to areas_to_move.len)
 		CHECK_TICK
-<<<<<<< HEAD
-=======
 		var/area/internal_area = areas_to_move[i]
 		internal_area.afterShuttleMove(new_parallax_dir)													//areas

->>>>>>> 4d420b8... Shuttle rotation refactor and significant performance upgrade (#31942)
 	check_poddoors()
 	new_dock.last_dock_time = world.time
 	setDir(new_dock.dir)