From 49c72a8a9109f70cf4e1bd2c7ffdeb6329ffe159 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 17 Nov 2017 23:39:06 -0500
Subject: [PATCH] Update on_move.dm

---
 code/modules/shuttle/on_move.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 2fc795568b..2c48d18e6e 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -26,16 +26,8 @@ All ShuttleMove procs go here
 				if(M.pulledby)
 					M.pulledby.stop_pulling()
 				M.stop_pulling()
-<<<<<<< HEAD
-				M.visible_message("<span class='warning'>[src] slams into [M]!</span>")
-				if(M.key || M.get_ghost(TRUE))
-					SSblackbox.add_details("shuttle_gib", "[type]")
-				else
-					SSblackbox.add_details("shuttle_gib_unintelligent", "[type]")
-=======
 				M.visible_message("<span class='warning'>[shuttle] slams into [M]!</span>")
 				SSblackbox.record_feedback("tally", "shuttle_gib", 1, M.type)
->>>>>>> 8b19b49... JSON feedback (#32188)
 				M.gib()
 
 		else //non-living mobs shouldn't be affected by shuttles, which is why this is an else