# Conflicts: # build/azure-pipelines.yml # src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj # src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs # src/Umbraco.Web.UI.Client/.nvmrc # src/Umbraco.Web.UI.Client/package-lock.json # src/Umbraco.Web.UI.Client/package.json