From 332e3271d9c29da24dda7e4aba9190f6eb1f47ef Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 17 Feb 2020 01:31:48 -0500
Subject: [PATCH] Update ore_box.dm

---
 code/modules/mining/ore_box.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/modules/mining/ore_box.dm b/code/modules/mining/ore_box.dm
index 90696abfac..39c86052f1 100644
--- a/code/modules/mining/ore_box.dm
+++ b/code/modules/mining/ore_box.dm
@@ -40,15 +40,11 @@
 
 /obj/structure/ore_box/examine(mob/user)
 	to_chat(user, "That's an [src].")
-<<<<<<< HEAD:code/modules/mining/satchel_ore_boxdm.dm
-	to_chat(user,desc)
+	to_chat(user, desc)
 
 	// Borgs can now check contents too.
 	if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
 		return
-=======
-	to_chat(user, desc)
->>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693):code/modules/mining/ore_box.dm
 
 	if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them.
 		return
@@ -116,4 +112,4 @@
 			O.loc = src.loc
 			O.ex_act(severity++)
 		qdel(src)
-		return
\ No newline at end of file
+		return