From bd06a75f81e79886734be38a32838275de259b38 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jan 2020 01:16:43 -0500
Subject: [PATCH] Update cargo_train.dm

---
 code/modules/vehicles/cargo_train.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index a6b007bf82..6e387ae04e 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -26,12 +26,8 @@
 
 /obj/vehicle/train/trolley
 	name = "cargo train trolley"
-<<<<<<< HEAD
-	icon = 'icons/obj/vehicles_vr.dmi'	//VOREStation Edit
-=======
 	desc = "A large, flat platform made for putting things on. Or people."
-	icon = 'icons/obj/vehicles.dmi'
->>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds
+	icon = 'icons/obj/vehicles_vr.dmi'	//VOREStation Edit
 	icon_state = "cargo_trailer"
 	anchored = 0
 	passenger_allowed = 0