From 14c7647f5fc2ecac3f87b504864e04a3d09e7a49 Mon Sep 17 00:00:00 2001
From: cadyn <35672377+cadyn@users.noreply.github.com>
Date: Sat, 27 Feb 2021 14:53:42 -0800
Subject: [PATCH] Update tile_types.dm

---
 code/game/objects/items/stacks/tiles/tile_types.dm | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 3fc2f39441..145a67816e 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -20,21 +20,13 @@
 	drop_sound = 'sound/items/drop/axe.ogg'
 	pickup_sound = 'sound/items/pickup/axe.ogg'
 
-<<<<<<< HEAD
 	var/datum/material/material						//CHOMPEDIT: Start, To make tiles have material variables
 	var/default_type = DEFAULT_WALL_MATERIAL
 	var/perunit = SHEET_MATERIAL_AMOUNT
 	var/apply_colour							//CHOMPEDIT: End
 
-/obj/item/stack/tile/New()
-	..()
-||||||| parent of a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
-/obj/item/stack/tile/New()
-	..()
-=======
 /obj/item/stack/tile/Initialize()
 	. = ..()
->>>>>>> a55ce9bf09... Merge pull request #9772 from VOREStation/upstream-merge-7893
 	randpixel_xy()
 
 /*