From d9121b4684284d804b0b3ca504af63c42e5fda67 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Tue, 26 Mar 2013 22:12:35 +0600
Subject: [PATCH] fixes merge

---
 src/Umbraco.Web/umbraco.presentation/macro.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index 2aac88fd87..2a511acc84 100644
--- 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>