From a940d19a13fe41b63bf925e716072b198232d3c8 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 24 Jul 2020 08:43:34 -0400
Subject: [PATCH] Update material_recipes.dm

---
 code/modules/materials/material_recipes.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index 36b2d241c4b..a5079be7204 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -158,11 +158,8 @@
 	recipes += new/datum/stack_recipe("wooden bucket", /obj/item/weapon/reagent_containers/glass/bucket/wood, 2, time = 4, one_per_turf = 0, on_floor = 0, pass_stack_color = TRUE)
 	recipes += new/datum/stack_recipe("coilgun stock", /obj/item/weapon/coilgun_assembly, 5, pass_stack_color = TRUE)
 	recipes += new/datum/stack_recipe("crude fishing rod", /obj/item/weapon/material/fishing_rod/built, 8, time = 10 SECONDS, pass_stack_color = TRUE)
-<<<<<<< HEAD
 	recipes += new/datum/stack_recipe("wooden standup figure", /obj/structure/barricade/cutout, 5, time = 10 SECONDS, pass_stack_color = TRUE) //VOREStation Add
-=======
 	recipes += new/datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1)
->>>>>>> 03b7a0e... Persistent Trash/Dirt/Graffiti/Notices (#7337)
 
 /material/wood/log/generate_recipes()
 	recipes = list()