From b3defcb0076a28c40cdaf1b61738e2341e82f899 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 15 Aug 2013 13:05:09 +1000
Subject: [PATCH] fixes merge issues

---
 .../Persistence/Repositories/ContentRepository.cs           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index fe4dae0be2..86c177fa91 100644
--- 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>