Fixes up merge issues.

2013-10-09 13:52:24 +11:00
parent f8d6c85779
commit 1c13a896eb
4 changed files with 13 additions and 21 deletions
--- a/src/Umbraco.Core/CacheHelper.cs
+++ b/src/Umbraco.Core/CacheHelper.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Core
        /// <remarks>
        /// Good for unit testing
        /// </remarks>
-        internal static CacheHelper CreateDisabledCacheHelper()
+        public static CacheHelper CreateDisabledCacheHelper()
        {
            return new CacheHelper(null, null, null, false);
        }