Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
WillieRuemmele committed Aug 8, 2023
2 parents 004413b + 53c5340 commit 7755f9d
Show file tree
Hide file tree
Showing 2 changed files with 271 additions and 71 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^2.9.3",
"@oclif/core": "^2.11.7",
"@salesforce/core": "^4.3.7",
"@salesforce/kit": "^3.0.2",
"@salesforce/sf-plugins-core": "^3.1.8",
"@salesforce/kit": "^3.0.8",
"@salesforce/sf-plugins-core": "^3.1.14",
"tslib": "^2"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^4.0.10",
"@oclif/plugin-command-snapshot": "^4.0.11",
"@salesforce/cli-plugins-testkit": "^4.2.8",
"@salesforce/dev-config": "^4.0.1",
"@salesforce/dev-scripts": "^5.4.3",
Expand All @@ -22,17 +22,17 @@
"@swc/core": "1.3.39",
"@types/inquirer": "^9.0.3",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@typescript-eslint/parser": "^5.62.0",
"chai": "^4.3.7",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.9.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-salesforce": "^2.0.2",
"eslint-config-salesforce-license": "^0.2.0",
"eslint-config-salesforce-typescript": "^1.1.2",
"eslint-plugin-header": "^3.1.1",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jsdoc": "^43.0.5",
"eslint-plugin-sf-plugin": "^1.15.13",
"eslint-plugin-sf-plugin": "^1.16.1",
"husky": "^7.0.4",
"mocha": "^9.2.2",
"nyc": "^15.1.0",
Expand Down
Loading

0 comments on commit 7755f9d

Please sign in to comment.