Update crayon.dm

2017-11-08 02:22:48 -06:00
parent 5bcaf7a3b1
commit a297f4bc7f
1 changed files with 0 additions and 6 deletions
--- 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)