From e7a828c80f529741b81c9de27c970065baf42e60 Mon Sep 17 00:00:00 2001
From: HugoLuman <qaggeler@uci.edu>
Date: Wed, 20 Apr 2016 14:53:23 -0700
Subject: [PATCH] Fixes merge conflict with interface/stylesheet.dm

The abductor's stylcecolor in the recently merged PR used the same line as the Drask's
---
 interface/stylesheet.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 5ed85668221..259c5d3ff49 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -94,6 +94,7 @@ h1.alert, h2.alert		{color: #000000;}
 .shadowling				{color: #3b2769;}
 .vulpkanin				{color: #B97A57;}
 .drask					{color: #a3d4eb; font-family: "Arial Black";}
+.abductor				{color: #800080;}
 .rough					{color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;}
 .say_quote				{font-family: Georgia, Verdana, sans-serif;}
 .sans					{font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}