From 139815416e4d7822b1c9d3f00539d8ce9a4c1980 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 4 Nov 2013 21:43:23 +0000
Subject: Added merchant faction color.

---
 base/ini/factions.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index ab33bc4..f3c48a1 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -76,6 +76,8 @@ name=Mercenaries Guild
 [faction]
 label=merchants
 name=Merchants Association
+color=24 132 8
+colorsecond=255 238 58
 
 [faction]
 label=pirates
-- 
cgit v1.2.3