From e3a19bb2ea86e7516cd5b4e7f728c07d5935ad48 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 21 Feb 2021 09:39:26 -0500
Subject: [PATCH] Update ore.dm

---
 code/modules/mining/ore.dm | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index c838dd5960..1c345021ab 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -113,11 +113,7 @@
 	icon_state = "slag"
 	material = null
 
-<<<<<<< HEAD
-/obj/item/weapon/ore/New()
-=======
 /obj/item/weapon/ore/Initialize()
->>>>>>> e47f39e... Porting Fixes (#7891)
 	..()
 	randpixel_xy()
 
@@ -127,7 +123,6 @@
 		C.sample_item(src, user)
 	else
 		return ..()
-<<<<<<< HEAD
 
 //VOREStation Add
 /obj/item/weapon/ore/attack(mob/living/M as mob, mob/living/user as mob)
@@ -140,5 +135,3 @@
 		return
 	..()
 //VOREStation Add End
-=======
->>>>>>> e47f39e... Porting Fixes (#7891)