Skip to content

Commit 122bf65

Browse files
author
Chris Cole
committed
chore: merge conflict
2 parents 6511896 + 037377d commit 122bf65

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"license": "SEE LICENSE IN LICENSE",
6262
"dependencies": {
63-
"@defra/forms-model": "^3.0.435",
63+
"@defra/forms-model": "^3.0.438",
6464
"@defra/hapi-tracing": "^1.0.0",
6565
"@elastic/ecs-pino-format": "^1.5.0",
6666
"@hapi/boom": "^10.0.1",

0 commit comments

Comments
 (0)