Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v8/feature/version-history-clean…
Browse files Browse the repository at this point in the history
…up-ui' into v9/feature/merge_and_clean_history_cleanup

# Conflicts:
#	tests/Umbraco.Tests.AcceptanceTest/package.json
  • Loading branch information
bergmania committed Nov 2, 2021
2 parents 89aa7f8 + 8e49b91 commit d18afd3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/Umbraco.Tests.AcceptanceTest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"del": "^6.0.0",
"ncp": "^2.0.0",
"prompt": "^1.2.0",
"umbraco-cypress-testhelpers": "^1.0.0-beta-59"
"umbraco-cypress-testhelpers": "^1.0.0-beta-60"
},
"dependencies": {
"typescript": "^3.9.2"
Expand Down

0 comments on commit d18afd3

Please sign in to comment.