From 11d28d72cece0c73232ca0caf15ff348d973a678 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 19 Jun 2021 09:23:17 -0400
Subject: [PATCH] Update snacks.dm

---
 code/modules/food/food/snacks.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index eea1309af67..3f5213f728a 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -187,16 +187,7 @@
 			"<font color='blue'>You scoop up some [src] with \the [U]!</font>" \
 		)
 
-<<<<<<< HEAD
-			src.bitecount++
-			U.cut_overlays()
-			U.loaded = "[src]"
-			var/image/I = new(U.icon, "loadedfood")
-			I.color = src.filling_color
-			U.add_overlay(I)
-=======
 		bitecount++
->>>>>>> 1672a51... Refactors utensils to use weakrefs (#8140)
 
 		reagents.trans_to_obj(U, min(reagents.total_volume,5))