# Conflicts: # build/NuSpecs/UmbracoCms.Core.nuspec # build/NuSpecs/UmbracoCms.nuspec # build/build.ps1 # src/SolutionInfo.cs # src/Umbraco.Core/Diagnostics/MiniDump.cs # src/Umbraco.Core/Sync/DatabaseServerMessenger.cs # src/Umbraco.Infrastructure/Persistence/LocalDb.cs # src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyHandler.cs # src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
20 KiB
20 KiB