From 77d6c2b33eb95b2c1d1a045ad8f0f58eec39919a Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jul 2020 22:31:40 -0400
Subject: [PATCH] Update largecrate.dm

---
 code/game/objects/structures/crates_lockers/largecrate.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index b7c7c94f1d..7ed37d0620 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -83,13 +83,6 @@
 	starts_with = list(/obj/structure/vehiclecage/quadtrailer)
 
 /obj/structure/largecrate/animal
-<<<<<<< HEAD
-	icon_state = "lisacrate"	//VOREStation Edit
-
-/obj/structure/largecrate/animal/mulebot
-	name = "Mulebot crate"
-	icon_state = "mulecrate"	//VOREStation Edit
-=======
 	icon_state = "crittercrate"
 	desc = "A hefty wooden crate with air holes. It is marked with the logo of NanoTrasen Pastures and the slogan, '90% less cloning defects* than competing brands**, or your money back***!'"
 
@@ -97,7 +90,6 @@
 	name = "Mulebot crate"
 	desc = "A hefty wooden crate labelled 'Proud Product of the Xion Manufacturing Group'"
 	icon_state = "mulecrate"
->>>>>>> d7f25c3... Flavour Enhancement: Crates (#7342)
 	starts_with = list(/mob/living/bot/mulebot)
 
 /obj/structure/largecrate/animal/corgi