From 6d123c8d73a1a495e7fb51985365342a428f6f77 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 13 Apr 2019 22:55:08 -0400
Subject: [PATCH] Update materials.dm

---
 code/modules/materials/materials.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index b31c849563..5428e110db 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -359,11 +359,7 @@ var/list/name_to_material
 	name = "marble"
 	icon_colour = "#AAAAAA"
 	weight = 26
-<<<<<<< HEAD
 	hardness = 30 //VOREStation Edit - Please.
-=======
-	hardness = 70
->>>>>>> 4ff3ee1... Merge pull request #6023 from Mechoid/Precursotech_Baseline
 	integrity = 201 //hack to stop kitchen benches being flippable, todo: refactor into weight system
 	stack_type = /obj/item/stack/material/marble
 
@@ -1070,4 +1066,4 @@ var/list/name_to_material
 	icon_colour = "#ff9900"
 	hardness = 1
 	weight = 1
-	protectiveness = 0 // 0%
\ No newline at end of file
+	protectiveness = 0 // 0%