From cdeb6b73cc1525ea2cb70e06042afcebf9a96fdb Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Wed, 22 Jul 2020 18:02:16 -0400
Subject: [PATCH] Update supply.dm

---
 code/datums/supplypacks/supply.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index aac622a9f4..0863ec8cbb 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -134,10 +134,5 @@
 	name = "Cargo Train Trolley"
 	contains = list(/obj/vehicle/train/trolley)
 	cost = 15
-<<<<<<< HEAD
-	containertype = /obj/structure/largecrate
-	containername = "Cargo Train Trolley Crate"
-=======
 	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Cargo Train Trolley Crate"
->>>>>>> d7f25c3... Flavour Enhancement: Crates (#7342)