From 86cfa46c9b31c5ccd7445e7ef5e2399ade680049 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 17:53:11 -0600
Subject: [PATCH] Update browserOutput.css

---
 code/modules/goonchat/browserassets/css/browserOutput.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
index 482290fc37..cb3ca7d6be 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -383,13 +383,11 @@ h1.alert, h2.alert		{color: #000000;}
 .swarmer				{color: #2C75FF;}
 .resonate				{color: #298F85;}
 
-<<<<<<< HEAD
 .love					{color: #FF69Bf;}
 .lovebold				{color: #FF69Bf; font-weight: bold;}
-=======
 .monkeyhive				{color: #774704;}
 .monkeylead				{color: #774704;	font-size: 2;}
->>>>>>> d3aacc2... [READY] Monkey mode overhaul (#32916)
+
 
 .connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
 .connectionClosed.restored {background: green;}