From 4e0cba3b804ff02b0c51588cba5420a9172682ca Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 19 Jun 2021 09:22:31 -0400
Subject: [PATCH] Update kitchen.dm

---
 .../game/objects/items/weapons/material/kitchen.dm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm
index 071f581e4b8..ea16a3be206 100644
--- a/code/game/objects/items/weapons/material/kitchen.dm
+++ b/code/game/objects/items/weapons/material/kitchen.dm
@@ -48,19 +48,6 @@
 	if (loaded && reagents.total_volume > 0)
 		var/atom/movable/eaten = loaded?.resolve()
 		reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
-<<<<<<< HEAD
-		if(M == user)
-			if(!M.can_eat(loaded))
-				return
-			M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
-		else
-			user.visible_message("<span class='warning'>\The [user] begins to feed \the [M]!</span>")
-			if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
-				return
-			M.visible_message("<span class='notice'>\The [user] feeds some [loaded] to \the [M] with \the [src].</span>")
-		playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1)
-		cut_overlays()
-=======
 		if(eaten)	
 			if(M == user)
 				if(!M.can_eat(eaten))
@@ -73,7 +60,6 @@
 				M.visible_message(SPAN_NOTICE("\The [user] feeds some of \the [eaten] to \the [M] with \the [src]."))
 			playsound(src,'sound/items/eatfood.ogg', rand(10,40), 1)
 		update_icon()
->>>>>>> 1672a51... Refactors utensils to use weakrefs (#8140)
 		return
 	else
 		to_chat(user, SPAN_WARNING("You don't have anything on \the [src]."))	//if we have help intent and no food scooped up DON'T STAB OURSELVES WITH THE FORK