From 3c06d6234546207146c6bc2ad8bd06b0ff9226fb Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 8 Mar 2020 03:25:18 -0400
Subject: [PATCH] Update weldingtool.dm

---
 code/game/objects/items/weapons/tools/weldingtool.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index 122fc3a2254..51f486766a6 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -656,9 +656,6 @@
 /obj/item/weapon/weldingtool/electric/mounted/cyborg
 	toolspeed = 0.5
 
-<<<<<<< HEAD
-#undef WELDER_FUEL_BURN_INTERVAL
-=======
 /obj/item/weapon/weldingtool/electric/mounted/exosuit
 	var/obj/item/mecha_parts/mecha_equipment/equip_mount = null
 	flame_intensity = 1
@@ -682,4 +679,3 @@
 			setWelding(FALSE, M.occupant)
 
 #undef WELDER_FUEL_BURN_INTERVAL
->>>>>>> 51fd39f... Exosuit Expansion: Return of the Ripley (#6767)