# Conflicts: # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # tests/Umbraco.Tests.AcceptanceTest/package-lock.json # version.json
# Conflicts: # src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs # tests/Umbraco.Tests.AcceptanceTest/package-lock.json # version.json