Update coil.dm

2018-03-17 19:48:42 -04:00
parent a4e10653c7
commit b9a73ded87
1 changed files with 0 additions and 3 deletions
@@ -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"