fixes merge

2013-03-26 22:12:35 +06:00
parent 132ec1702c
commit d9121b4684
1 changed files with 0 additions and 5 deletions
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -854,11 +854,6 @@ namespace umbraco
            return LoadMacroXslt(macro, model, pageElements, false);
        }

-        public Control loadMacroXSLT(macro macro, MacroModel model, Hashtable pageElements)
-        {
-            return LoadMacroXSLT(macro, model, pageElements, false);
-        }
-
        /// <summary>
        /// Parses the text for umbraco Item controls that need to be rendered.
        /// </summary>