More manual merging

2019-06-28 15:03:52 +10:00
parent 568835f7e2
commit 4a33ca99ba
13 changed files with 153 additions and 38 deletions
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -244,7 +244,7 @@ namespace Umbraco.Web.Trees
            return result;
        }

-        internal virtual IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
+        private IEnumerable<IEntitySlim> GetChildrenFromEntityService(int entityId)
            => Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToList();

        /// <summary>