From 31e430a85b62e92952400bfc2b092cd39cd8d663 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 8 Sep 2011 17:49:52 -0700
Subject: Fixed windows packaging merge errors

---
 linden/indra/lib/python/indra/util/llmanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/lib')

diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 3cd8786..20875f9 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -126,7 +126,7 @@ ARGUMENTS=[
          default="Release"),
     dict(name='branding_id', description="""Identifier for the branding set to 
         use.  Currently, 'imprudence')""", 
-         default='inworldz'),
+         default='imprudence'),
     dict(name='configuration',
          description="""The build configuration used. On OSX this is
          Universal, etc. On Windows it's the *actual* buildtype for
-- 
cgit v1.1