From 8a693c6c719c7d27a6d76ff0975a76eea4374b4a Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Fri, 17 Mar 2023 02:20:31 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/game/turfs/flooring/flooring.dm | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index d7b2d52246..51d48e6042 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -286,13 +286,8 @@ var/list/flooring_types
 	icon_base = "snowyplayingdrift"
 
 /decl/flooring/carpet
-<<<<<<< HEAD
 	name = "red carpet" //CHOMPEDIT renamed to red carpet
-	desc = "Imported and comfy."
-=======
-	name = "carpet"
 	desc = "Lush synthetic carpeting, perfectly engineered for easy cleaning."
->>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962
 	icon = 'icons/turf/flooring/carpet.dmi'
 	icon_base = "carpet"
 	build_type = /obj/item/stack/tile/carpet
@@ -316,11 +311,7 @@ var/list/flooring_types
 	build_type = /obj/item/stack/tile/carpet/blucarpet
 
 /decl/flooring/carpet/turcarpet
-<<<<<<< HEAD
-	name = "turquoise carpet"   //CHOMPstation edit: changing name to turquoise
-=======
 	name = "turquoise carpet"
->>>>>>> 21acee71bf... Merge pull request #14551 from VOREStation/upstream-merge-8962
 	icon_base = "turcarpet"
 	build_type = /obj/item/stack/tile/carpet/turcarpet