From c2361b6997d0a3a1f2ccfa83b2892f5f32269a1e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 17:53:13 -0600 Subject: [PATCH] Update stylesheet.dm --- interface/stylesheet.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index bef6731c9f..3a43667a5d 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -165,12 +165,9 @@ h1.alert, h2.alert {color: #000000;} .monkey {color: #975032;} .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) "}