Update items.dm

2017-12-14 17:23:09 -05:00
parent 2aef00daf0
commit 8beeeefa44
1 changed files with 1 additions and 3 deletions
@@ -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)