From e413f4b335a2f4f5a1ca151c8ab67324a72ebaee Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 10 May 2013 15:13:07 -0700
Subject: Fixup merge diffs

---
 indra/newview/character/avatar_lad.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/character')

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 41080818c9..e5b385f4aa 100755
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -1084,7 +1084,7 @@
          scale="0 0 .5" />
       </param_skeleton>
     </param>
-                  <param
+                          <param
      id="11001"
      group="0"
      name="Hover"
-- 
cgit v1.3