From 458cf6a27152a35b36066409066b1febcae6dc30 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Tue, 14 Mar 2023 17:56:46 +1000
Subject: [PATCH] Update crayon.dm

---
 code/game/objects/effects/decals/crayon.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 72a70c413ac..248b9cfbb46 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -6,15 +6,10 @@
 	layer = DIRTY_LAYER
 	anchored = TRUE
 
-<<<<<<< HEAD
 /obj/effect/decal/cleanable/crayon/New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
 	..()
 	loc = location
 
-=======
-/obj/effect/decal/cleanable/crayon/Initialize(var/ml, main = "#FFFFFF",shade = "#000000",var/type = "rune")
-	. = ..(ml, 0) // mapload, age
->>>>>>> a2c68d9a8df... Sheet storage has different caps per type. (#9029)
 	name = type
 	desc = "A [type] drawn in crayon."