From ec2ea599ed8e63c76992b875313af5ba0e1b0fed Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Thu, 19 Jan 2023 12:33:24 +1000
Subject: [PATCH] Update weldingtool.dm

---
 code/game/objects/items/weapons/tools/weldingtool.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm
index f4fe294f8de..8fbd4fe4d44 100644
--- a/code/game/objects/items/weapons/tools/weldingtool.dm
+++ b/code/game/objects/items/weapons/tools/weldingtool.dm
@@ -91,13 +91,9 @@
 
 		if(S.robo_repair(15, BRUTE, "some dents", src, user))
 			remove_fuel(1, user)
-<<<<<<< HEAD
-			return 1
+			return TRUE
 		else
-			return 1 //Stops you from accidentally harming someone while on help intent.
-=======
-		return TRUE
->>>>>>> 02c3aebf2a3... Repairing light robotic damage messaging fix (#8870)
+			return TRUE //Stops you from accidentally harming someone while on help intent.
 
 	return ..()