Fixes merge issues.

This commit is contained in:
Shannon Deminick
2013-03-20 00:50:37 +06:00
parent 610ff91a9d
commit 6c40f32c2a
2 changed files with 3 additions and 6 deletions

View File

@@ -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>

View File

@@ -416,8 +416,7 @@ namespace Umbraco.Core.Services
}
Audit.Add(AuditTypes.Delete, string.Format("Delete MediaTypes performed by user"), userId, -1);
}
}
}
}
/// <summary>