From 2b45a2613cd824a05ae2f33a154d6680120b7a7d Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 8 Aug 2020 23:56:46 -0400
Subject: [PATCH] Update Chemistry-Machinery.dm

---
 code/modules/reagents/Chemistry-Machinery.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 4b3c4b2d9c0..97c81cf7cb0 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -663,11 +663,10 @@
 			return
 		options["examine"] = radial_examine
 
-<<<<<<< HEAD
 	// if there is no power or it's broken, the procs will fail but the buttons will still show
 	if(length(holdingitems))
 		options["grind"] = radial_grind
-=======
+
 	if (usr.stat != 0)
 		return
 	if (!beaker)
@@ -676,7 +675,6 @@
 	beaker = null
 	visible_message("<span class='notice'>\The [usr] remove the container from \the [src].</span>")
 	update_icon()
->>>>>>> 864135b... Merge pull request #7425 from lbnesquik/Kot-Cooking-tweak
 
 	var/choice
 
@@ -844,4 +842,4 @@
 #undef MAX_MULTI_AMOUNT
 #undef MAX_UNITS_PER_PILL
 #undef MAX_UNITS_PER_PATCH
-#undef MAX_CUSTOM_NAME_LEN
\ No newline at end of file
+#undef MAX_CUSTOM_NAME_LEN