chore: merge main, resolve conflicts

salesforcecli · Oct 28, 2024 · 6542c9c · 6542c9c
2 parents 6191625 + 6b4253d
commit 6542c9c
Show file tree

Hide file tree

Showing 2 changed files with 276 additions and 261 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@salesforce/dev-scripts": "^10.2.10",
     "@salesforce/plugin-command-reference": "^3.1.27",
     "eslint-plugin-sf-plugin": "^1.20.8",
-    "oclif": "^4.15.6",
+    "oclif": "^4.15.12",
     "ts-node": "^10.9.2",
     "typescript": "^5.6.3"
   },