fix: merge conflict

salesforcecli · Oct 22, 2024 · 7ee02aa · 7ee02aa
2 parents 30479af + a344290
commit 7ee02aa
Show file tree

Hide file tree

Showing 2 changed files with 216 additions and 369 deletions.
diff --git a/package.json b/package.json
@@ -11,14 +11,14 @@
     "@salesforce/ts-types": "^2.0.11"
   },
   "devDependencies": {
-    "@oclif/core": "^4.0.28",
+    "@oclif/core": "^4.0.29",
     "@oclif/plugin-command-snapshot": "^5.2.18",
     "@salesforce/cli-plugins-testkit": "^5.3.34",
     "@salesforce/dev-scripts": "^10.2.10",
-    "@salesforce/plugin-command-reference": "^3.1.27",
+    "@salesforce/plugin-command-reference": "^3.1.29",
     "chai-each": "^0.0.1",
-    "eslint-plugin-sf-plugin": "^1.20.8",
-    "oclif": "^4.15.6",
+    "eslint-plugin-sf-plugin": "^1.20.9",
+    "oclif": "^4.15.9",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
   },