From 4a94043fe9bac6f805529a8952e36b498258b2b5 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 30 Oct 2021 23:02:45 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/modules/materials/materials/organic/wood.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm
index 63314d0fcc..8336c31aa0 100644
--- a/code/modules/materials/materials/organic/wood.dm
+++ b/code/modules/materials/materials/organic/wood.dm
@@ -110,18 +110,12 @@
 	icon_colour = "#0099cc" // Cyan-ish
 	stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2)
 	stack_type = /obj/item/stack/material/log/sif
-<<<<<<< HEAD
-	
-||||||| parent of b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc
-
-=======
 
 /datum/material/wood/log/hard
 	name = MAT_HARDLOG
 	icon_colour = "#6f432a"
 	stack_type = /obj/item/stack/material/log/hard
 
->>>>>>> b4ce0442cd... Merge pull request #11722 from KillianKirilenko/kk-misc
 //VOREStation Addition Start
 /datum/material/wood/stick
 	name = "wooden stick"