Fixes merge conflicts

2020-08-07 14:00:56 +02:00
parent 9cafeaf39e 39162f0f6a
commit c57c42d2ec
237 changed files with 29451 additions and 4202 deletions
--- a/src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
+++ b/src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Models.ContentEditing
    [DataContract(Name = "content", Namespace = "")]
    public class ContentItemSave : IContentSave<IContent>
    {
-        protected ContentItemSave()
+        public ContentItemSave()
        {
            UploadedFiles = new List<ContentPropertyFile>();
            Variants = new List<ContentVariantSave>();