From b9a73ded875269760683764431b7e9933e055278 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sat, 17 Mar 2018 19:48:42 -0400
Subject: [PATCH] Update coil.dm

---
 code/modules/power/tesla/coil.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 866e06036c..4efc77c697 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -135,13 +135,10 @@
 	if(default_deconstruction_screwdriver(user, "rpcoil_open[anchored]", "rpcoil[anchored]", W))
 		return
 	return ..()
-<<<<<<< HEAD
-=======
 
 /obj/machinery/power/tesla_coil/research/on_construction()
 	if(anchored)
 		connect_to_network()
->>>>>>> 325ca19... Merge pull request #36399 from DaxDupont/fixes-mike-pence
 
 /obj/machinery/power/grounding_rod
 	name = "grounding rod"