From 4ad7c79c7fe7cee0f22b188425fdc25c45dbee8c Mon Sep 17 00:00:00 2001
From: Razgriz <razgriz1032@gmail.com>
Date: Mon, 7 Dec 2020 21:27:12 -0700
Subject: [PATCH] Update ss13styles.css

---
 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 16064b8da9..0a4c96f4d6 100644
--- a/code/modules/vchat/css/ss13styles.css
+++ b/code/modules/vchat/css/ss13styles.css
@@ -172,15 +172,11 @@ h1.alert, h2.alert		{color: #000000;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 .terminus				{font-family: "Times New Roman", Times, serif, sans-serif}
 .interface				{color: #330033;}
-<<<<<<< HEAD
 /* YW Edit start */
 .psionic                                {color: #993399;}    
 .wingdings                              {font-family: Wingdings, Webdings} 
 /* YW Edit End */
-||||||| parent of 6afcf6548d... Merge pull request #9392 from Wrackbang/master
-=======
 .spacer					{color: #9c660b;} /* VOREStation Add */
->>>>>>> 6afcf6548d... Merge pull request #9392 from Wrackbang/master
 
 .black					{color: #000000;}
 .darkgray				{color: #808080;}