Merge pull request #23819 from jhipster/dependabot/npm_and_yarn/yeoma…

…n/conflicter-1.1.0 build(deps): bump @yeoman/conflicter from 1.0.10 to 1.1.0
jhipster · Oct 11, 2023 · 994b7bc · 994b7bc
2 parents 31dae68 + 413fca4
commit 994b7bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.5",
     "@typescript-eslint/parser": "6.7.5",
     "@yeoman/adapter": "1.2.0",
-    "@yeoman/conflicter": "1.0.10",
+    "@yeoman/conflicter": "1.1.0",
     "@yeoman/namespace": "1.0.0",
     "@yeoman/transform": "1.2.0",
     "@yeoman/types": "1.0.1",