From 68d5acbe48624a37bc53514dc9eb3ada02014724 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 14 Feb 2013 23:55:39 +0600
Subject: [PATCH] Fix merge issue

---
 .../ApplicationEventsResolver.cs                 | 16 +---------------
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj         |  5 ++++-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 4b12ada30e..bb207708af 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -73,21 +73,7 @@ namespace Umbraco.Core.ObjectResolution
             {
                 get { return Values; }
             }
-	    }
-
-	    private class LegacyStartupHandlerResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>
-	    {
-	        internal LegacyStartupHandlerResolver(IEnumerable<Type> legacyStartupHandlers)
-                : base(legacyStartupHandlers)
-	        {
-
-	        }
-
-            public IEnumerable<IApplicationStartupHandler> LegacyStartupHandlers
-            {
-                get { return Values; }
-            }
-	    }
+	    }	    
 
 	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 97994125f3..40a71cf9a4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -488,6 +488,7 @@
     </None>
     <None Include="Config\ExamineIndex.Release.config">
       <DependentUpon>ExamineIndex.config</DependentUpon>
+      <SubType>Designer</SubType>
     </None>
     <None Include="Config\Dashboard.Release.config">
       <DependentUpon>Dashboard.config</DependentUpon>
@@ -1904,7 +1905,9 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="Config\ExamineSettings.config" />
-    <Content Include="Config\ExamineIndex.config" />
+    <Content Include="Config\ExamineIndex.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Config\scripting.config" />
     <Content Include="Config\Skinning.config" />
     <Content Include="Config\feedProxy.config" />