From 39fe24e2d28930ce92c973bb0bbef656e33bc67e Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sun, 12 Dec 2021 04:27:58 -0500
Subject: [PATCH] powder that makes you say yes

---
 code/modules/vchat/css/ss13styles.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css
index 383d0f1754..e30b1a57bb 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -180,11 +180,7 @@ h1.alert, h2.alert		{color: #000000;}
 /* YW Edit End */
 .spacer					{color: #9c660b;} /* VOREStation Add */
 .blob					{color: #ff950d; font-weight: bold; font-style: italic;}
-<<<<<<< HEAD
-.squeakish				{color: #f54298; font-family: Arial}
-=======
 .tavan					{color: #f54298; font-family: Arial}
->>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001
 
 .black					{color: #000000;}
 .darkgray				{color: #808080;}