From 4143dbd02dcdf35166b1039142fa23b92308e46d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 18 Jun 2013 15:20:18 +1000
Subject: [PATCH] Fixed some merge issues

---
 src/Umbraco.Web/WebBootManager.cs                               | 2 --
 .../umbraco.presentation/umbraco/Trees/loadPackages.cs          | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs
index a796b70e62..830fe35cdd 100644
--- a/src/Umbraco.Web/WebBootManager.cs
+++ b/src/Umbraco.Web/WebBootManager.cs
@@ -227,8 +227,6 @@ namespace Umbraco.Web
                 string.Format("umbraco-{0}-{1}", "surface", meta.ControllerName),
                 umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}",//url to match
                 new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional },
-                //NOTE: There SHOULD be a constraint here to only match controllers with a "SurfaceController" suffix but we forgot to include it in the 
-                // 4.10 release so we can't include it now :(
                 new[] { meta.ControllerNamespace }); //look in this namespace to create the controller
             route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set                
             //make it use our custom/special SurfaceMvcHandler
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
index bb9401a8f9..cbdc3f0a90 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
@@ -8,6 +8,7 @@ using umbraco.businesslogic;
 using umbraco.cms.businesslogic.packager;
 using umbraco.cms.presentation.Trees;
 using Umbraco.Core;
+using umbraco.interfaces;
 
 namespace umbraco
 {