From a297f4bc7f7a552c278c07c8bfbefcde1a498ca3 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 8 Nov 2017 02:22:48 -0600
Subject: [PATCH] Update crayon.dm

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

diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 1358dbfc8d..4362957a76 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -25,12 +25,6 @@
 		var/matrix/M = matrix()
 		M.Turn(rotation)
 		src.transform = M
-<<<<<<< HEAD
-
-	add_atom_colour(main, FIXED_COLOUR_PRIORITY)
-=======
 	if(main)
 		paint_colour = main
 	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
-
->>>>>>> 8c3948b... Crayon rotation as a type var (#32441)