From e08322f6fe61b9fbe04db8a419072dd5c1cdf42a Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sun, 5 May 2013 23:45:47 -1000
Subject: [PATCH] Fixes merge issues

---
 .../Persistence/DefaultDatabaseFactory.cs     |  6 ++----
 src/Umbraco.Tests/TypeFinderTests.cs          |  2 +-
 .../controls/ContentTypeControlNew.ascx.cs    | 19 +------------------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index f55b5c189c..1a723166e6 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -68,8 +68,7 @@ namespace Umbraco.Core.Persistence
 						//double check
                         if (_nonHttpInstance == null)
 						{
-                            _nonHttpInstance = string.IsNullOrEmpty(_providerName) == false && string.IsNullOrEmpty(_providerName) == false
-						                      string.IsNullOrEmpty(_providerName) == false
+                            _nonHttpInstance = string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
 						                          ? new UmbracoDatabase(_connectionString, _providerName)
 						                          : new UmbracoDatabase(_connectionStringName);
 						}
@@ -82,8 +81,7 @@ namespace Umbraco.Core.Persistence
 			if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
 			{
 			    HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory),
-			                                  string.IsNullOrEmpty(_connectionString) == false &&
-			                                  string.IsNullOrEmpty(_providerName) == false
+			                                  string.IsNullOrEmpty(_connectionString) == false && string.IsNullOrEmpty(_providerName) == false
 			                                      ? new UmbracoDatabase(_connectionString, _providerName)
 			                                      : new UmbracoDatabase(_connectionStringName));
 			}
diff --git a/src/Umbraco.Tests/TypeFinderTests.cs b/src/Umbraco.Tests/TypeFinderTests.cs
index 85b8bc9c9d..40a71c3e38 100644
--- a/src/Umbraco.Tests/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/TypeFinderTests.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Tests
 			        typeof(ISqlHelper).Assembly,
 			        typeof(ICultureDictionary).Assembly,
                     typeof(Tag).Assembly,
-                    typeof(UmbracoExamine.BaseUmbracoIndexer).Assembly
+                    typeof(global::UmbracoExamine.BaseUmbracoIndexer).Assembly
 			    };
 
 		}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
index cf7088c5d5..b1adec8853 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
@@ -112,24 +112,7 @@ namespace umbraco.controls
 
             checkTxtAliasJs.Text = string.Format("checkAlias('{0}');", txtAlias.ClientID);
         }
-
-        /// <summary>
-        /// A class to track the async state for deleting a doc type property
-        /// </summary>
-        private class DeleteAsyncState
-        {
-            public Umbraco.Web.UmbracoContext UmbracoContext { get; private set; }
-            public GenericPropertyWrapper GenericPropertyWrapper { get; private set; }
-
-            public DeleteAsyncState(
-                Umbraco.Web.UmbracoContext umbracoContext,
-                GenericPropertyWrapper genericPropertyWrapper)
-            {
-                UmbracoContext = umbracoContext;
-                GenericPropertyWrapper = genericPropertyWrapper;
-            }
-        }
-
+        
         /// <summary>
         /// A class to track the async state for deleting a doc type property
         /// </summary>