From 49ce27aa68ffb221f5be8118bffd5c98bbdb214d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 18 Nov 2009 09:19:02 -0800
Subject: [PATCH] Fix merge conflict with button fonts, use SansSerifSmall (not
 bold)

---
 indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 89cf9e006c0..041297a542f 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -72,7 +72,7 @@
        	 width="80" />
     <button
     	 follows="bottom|left"
-     font="SansSerifSmallBold"
+     font="SansSerifSmall"
   	     height="25"
   	     label="New Outfit"
   	     layout="topleft"
-- 
GitLab