Fixes merge issues

2014-12-08 17:19:48 +11:00
parent 0a7bbfb1ca
commit d2dbd91b17
4 changed files with 3 additions and 10 deletions
--- a/src/Umbraco.Web/Scheduling/Scheduler.cs
+++ b/src/Umbraco.Web/Scheduling/Scheduler.cs
@@ -100,10 +100,6 @@ namespace Umbraco.Web.Scheduling
            _scrubberRunner.Add(new LogScrubber(appContext, settings));
        }

-        private static void PerformLogScrub(ApplicationContext appContext)
-        {
-            _scrubberRunner.Add(new LogScrubber(appContext));
-        }
        /// <summary>
        /// This performs all of the scheduling on the one timer
        /// </summary>