From 187af3e361567ea9ee60145162644eea148b769f Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 11 Mar 2013 21:23:35 +0600
Subject: [PATCH] Fixed merge issue

---
 src/Umbraco.Web/Mvc/SurfaceController.cs | 35 +-----------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index 3471b43c32..a4470e7fea 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -120,40 +120,7 @@ namespace Umbraco.Web.Mvc
             return new Attempt<RouteDefinition>(
                 new InvalidOperationException("Cannot find the Umbraco route definition in the route values, the request must be made in the context of an Umbraco request"));
         } 
-
-        /// <summary>
-        /// we need to recursively find the route definition based on the parent view context
-        /// </summary>
-        /// <returns></returns>
-        /// <remarks>
-        /// We may have Child Actions within Child actions so we need to recursively look this up.
-        /// see: http://issues.umbraco.org/issue/U4-1844
-        /// </remarks>
-        private Attempt<RouteDefinition> TryGetRouteDefinitionFromAncestorViewContexts()
-        {
-            ControllerContext currentContext = ControllerContext;
-            while (currentContext != null)
-            {
-                var currentRouteData = currentContext.RouteData;
-                if (currentRouteData.DataTokens.ContainsKey("umbraco-route-def"))
-                {
-                    return new Attempt<RouteDefinition>(true, (RouteDefinition)currentRouteData.DataTokens["umbraco-route-def"]);
-                }
-                if (currentContext.IsChildAction)
-                {
-                    //assign current context to parent
-                    currentContext = currentContext.ParentActionViewContext;
-                }
-                else
-                {
-                    //exit the loop
-                    currentRouteData = null;
-                }
-            }
-            return new Attempt<RouteDefinition>(
-                new InvalidOperationException("Cannot find the Umbraco route definition in the route values, the request must be made in the context of an Umbraco request"));
-        }
-
+        
 
     }
 }
\ No newline at end of file