From 25e871ad7807c2eca497fd1fbac2f950552d3fe7 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 9 Jun 2023 21:57:47 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/integrated_electronics/core/tools.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm
index 7cbe5b7dcc..b71158a541 100644
--- a/code/modules/integrated_electronics/core/tools.dm
+++ b/code/modules/integrated_electronics/core/tools.dm
@@ -564,7 +564,4 @@
 			for(var/i = 1 to 4)
 				new IC.type(src)
 	make_exact_fit()
-<<<<<<< HEAD
 	. = ..()
-=======
->>>>>>> b22b9e6e48... Merge pull request #14936 from ItsSelis/selis-weakrefs