From 01bf0bcfa54d4ed477e0f8823e448340c502907d Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sat, 6 Apr 2013 01:41:06 +0600
Subject: [PATCH] Fixes merge issues

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj           | 4 ++--
 src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs | 4 ++--
 src/Umbraco.Web/Umbraco.Web.csproj                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 97567ca29c..2420d11610 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -278,14 +278,14 @@
     </Compile>
     <Compile Include="Install\Default.aspx.cs">
       <DependentUpon>default.aspx</DependentUpon>
-       <SubType>ASPXCodeBehind</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="config\splashes\NoNodes.aspx.cs">
       <DependentUpon>noNodes.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="config\splashes\NoNodes.aspx.designer.cs">
-      <DependentUpon>noNodes.aspx</DependentUpon>   
+      <DependentUpon>noNodes.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Install\Default.aspx.designer.cs">
diff --git a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs b/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
index 503c53a9f3..23b810bc67 100644
--- a/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
+++ b/src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs
@@ -13,8 +13,8 @@ namespace Umbraco.Web.UI.Config.Splashes
         {
             base.OnInit(e);
 
-            var store = UmbracoContext.Current.RoutingContext.PublishedContentStore;
-            if (store.HasContent(UmbracoContext.Current))
+            var store = UmbracoContext.Current.ContentCache;
+            if (store.HasContent())
 			{
                 //if there is actually content, go to the root
 			    Response.Redirect("~/");
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 1672a78861..b083e0b61b 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -478,7 +478,7 @@
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\channels\rsd.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
-    </Compile
+    </Compile>
     <Compile Include="umbraco.presentation\umbraco\canvas.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>