From 8beeeefa44cc755c53df1d1490e938a03787ea19 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 14 Dec 2017 17:23:09 -0500
Subject: [PATCH] Update items.dm

---
 code/game/objects/items.dm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index d4fd9c710a..497ad4faf8 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -117,13 +117,11 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 
 	var/trigger_guard = TRIGGER_GUARD_NONE
 
-<<<<<<< HEAD
 	var/icon_override = null
-=======
+
 	//Grinder vars
 	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
 	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
->>>>>>> d447acd... All-In-One grinder results are now defined by type, not by huge lists (#33181)
 
 /obj/item/Initialize()
 	if (!materials)