Update browserOutput.css

2017-12-17 17:53:11 -06:00
parent 2f8d49de91
commit 86cfa46c9b
1 changed files with 1 additions and 3 deletions
@@ -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;}