From a36cda81e3eaf2a087383d8c9ff4d5b9c6b5ac5e Mon Sep 17 00:00:00 2001
From: slace <unknown@kiln.example.com>
Date: Wed, 22 Dec 2010 13:38:33 -1100
Subject: [PATCH] merge

---
 umbraco/presentation/web.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
index 3eb293a29d..49c948647f 100644
--- a/umbraco/presentation/web.config
+++ b/umbraco/presentation/web.config
@@ -33,8 +33,8 @@
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=CNUG;user id=DBUSER;password=DBPASSWORD" />
-    <add key="umbracoConfigurationStatus" value="4.1.0.RC" />
+    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=umbraco-nightly;integrated security=true;" />
+    <add key="umbracoConfigurationStatus" value="4.6.0.Alpha" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />