fixes merge issues

2013-08-15 13:05:09 +10:00
parent 89ce60ef0f
commit b3defcb007
1 changed files with 3 additions and 3 deletions
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -485,9 +485,7 @@ namespace Umbraco.Core.Persistence.Repositories

            return GetByVersion(dto.ContentVersionDto.VersionId);
        }
-
-        }
-
+        
        public void AssignEntityPermissions(IContent entity, string permission, IEnumerable<object> userIds)
        {
            var repo = new PermissionRepository<IContent>(UnitOfWork);
@@ -498,6 +496,8 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            var repo = new PermissionRepository<IContent>(UnitOfWork);
            return repo.GetPermissionsForEntity(entityId);
+        }
+
        #endregion
        
        /// <summary>