From b611dcfac76a161aa5276006d884e1d078593afa Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 28 Jun 2020 12:38:46 -0400
Subject: [PATCH] Update drill.dm

---
 code/modules/mining/drilling/drill.dm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index 9251f899a3e..ad92fcfbb03 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -59,21 +59,12 @@
 	default_apply_parts()
 	cell = default_use_hicell()
 
-<<<<<<< HEAD
-/obj/machinery/mining/drill/loaded
-	cell = /obj/item/weapon/cell/high
-
-/obj/machinery/mining/drill/get_cell()
-	return cell	
-
-=======
 /obj/machinery/mining/drill/get_cell()
 	return cell	
 
 /obj/machinery/mining/drill/loaded
 	cell = /obj/item/weapon/cell/high
 
->>>>>>> 9d5f32d... Adds get_cell to drill heads so you can use an inducer on them (#7274)
 /obj/machinery/mining/drill/process()
 
 	if(need_player_check)
@@ -406,4 +397,4 @@
 		return 0
 
 	src.set_dir(turn(src.dir, 270))
-	return 1
\ No newline at end of file
+	return 1