From de18173631b52131bddd042a58a23e8da4b5ba19 Mon Sep 17 00:00:00 2001
From: robvde <devnull@localhost>
Date: Tue, 10 Sep 2013 15:15:25 +0400
Subject: [PATCH] merge commit

---
 .hgignore                                                     | 1 +
 WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.hgignore b/.hgignore
index cc936f53..d97ccd13 100644
--- a/.hgignore
+++ b/.hgignore
@@ -21,3 +21,4 @@ WebsitePanel/Bin
 msbuild.log
 _ReSharper.*
 web.config
+web.config
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
index 3a721fdd..422797f2 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
@@ -5,11 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient"/>
+        <add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="1234567890"/>
+   <add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true"/>
     <!-- Web Applications -->