Resolve conflict before merge

2023-01-22 10:58:33 +01:00
parent c738032ada bf13f6cb76
commit 372b10944d
3 changed files with 0 additions and 1 deletions
--- a/out/make/deb/x64/trimsp_1.0.1_amd64.deb
+++ b/out/make/deb/x64/trimsp_1.0.1_amd64.deb
--- a/out/make/rpm/x64/TrimSP-1.0.1-1.x86_64.rpm
+++ b/out/make/rpm/x64/TrimSP-1.0.1-1.x86_64.rpm
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
    "electron": "^11.2.1"
  },
  "dependencies": {
-    "electron-squirrel-startup": "^1.0.0",
    "plotly.js-dist": "^1.58.4"
  },
  "config": {