From 6c40f32c2a9ec069453f8ce55a2396b54dd7078f Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Wed, 20 Mar 2013 00:50:37 +0600
Subject: [PATCH] Fixes merge issues.

---
 src/Umbraco.Core/Services/ContentService.cs     | 6 ++----
 src/Umbraco.Core/Services/ContentTypeService.cs | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 6e10502ab7..15f81f9049 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -1216,8 +1216,7 @@ namespace Umbraco.Core.Services
                     }
                 }
                 Audit.Add(AuditTypes.Publish, "RePublish All completed, the xml has been regenerated in the database", 0, -1);
-            }            
-            }
+            }                        
         }
 
 	    /// <summary>
@@ -1469,8 +1468,7 @@ namespace Umbraco.Core.Services
                 Audit.Add(AuditTypes.Publish, "Save and Publish performed by user", userId, content.Id);
 
                 return new Attempt<PublishStatus>(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
-	        }	        
-	        }
+	        }	        	        
         }
 
 	    /// <summary>
diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs
index a5a1048e65..9ecafc9ef6 100644
--- a/src/Umbraco.Core/Services/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeService.cs
@@ -416,8 +416,7 @@ namespace Umbraco.Core.Services
                 }
 
                 Audit.Add(AuditTypes.Delete, string.Format("Delete MediaTypes performed by user"), userId, -1);
-            }
-            }
+            }            
         }
 
         /// <summary>