Skip to content

Commit

Permalink
fix(merge conflicts): different versions in dependencies, notarize up…
Browse files Browse the repository at this point in the history
…date
  • Loading branch information
RealGoodProgrammer committed Jun 10, 2024
1 parent 0b91650 commit 7706427
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 5 deletions.
37 changes: 33 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"@capacitor/cli": "^6.0.0",
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@electron/notarize": "^2.2.0",
"@electron/notarize": "^2.3.2",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@openapitools/openapi-generator-cli": "^2.13.1",
"@rollup/plugin-commonjs": "^25.0.7",
Expand Down

0 comments on commit 7706427

Please sign in to comment.