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

…n/conflicter-1.0.10 build(deps): bump @yeoman/conflicter from 1.0.8 to 1.0.10
jhipster · Sep 14, 2023 · a019037 · a019037
2 parents c23cb97 + 6f415a8
commit a019037
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 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.0",
     "@typescript-eslint/parser": "6.7.0",
     "@yeoman/adapter": "1.2.0",
-    "@yeoman/conflicter": "1.0.8",
+    "@yeoman/conflicter": "1.0.10",
     "@yeoman/namespace": "1.0.0",
     "@yeoman/transform": "1.2.0",
     "@yeoman/types": "1.0.1",