From e084ddeb41c9b3bf0e7d090367d497e711ea8353 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 21 Feb 2013 06:14:01 +0600
Subject: [PATCH] Fixed up some merge issues.

---
 src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs | 3 +--
 src/Umbraco.Tests/Umbraco.Tests.csproj                   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index 67e07cb7b8..20a5e188d7 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -138,8 +138,7 @@ namespace Umbraco.Tests.TestHelpers
 
                 //We will swallow this exception! That's because a sub class might require further teardown logic.
             }
-                
-            }    
+                            
         }
 
 	    protected ApplicationContext ApplicationContext
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index fe7ffe8a7e..ce782b17f0 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -287,7 +287,6 @@
     <Compile Include="TestHelpers\Entities\MockedContentTypes.cs" />
     <Compile Include="TestHelpers\Entities\MockedEntity.cs" />
     <Compile Include="TestHelpers\Entities\MockedMedia.cs" />
-    <Compile Include="TestHelpers\SettingsForTests.cs" />
     <Compile Include="UmbracoExamine\ContentServiceTest.cs" />
     <Compile Include="UmbracoExamine\EventsTest.cs" />
     <Compile Include="UmbracoExamine\ExamineBaseTest.cs" />