devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed broken merge

Browse source
This commit is contained in:
Kaitlyn 2023-09-28 14:12:20 -04:00
parent 7409c65292
commit 29206b9244
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package.json
View file

@ -34,19 +34,11 @@
"@typescript-eslint/parser": "^6.7.3",
"@vencord/types": "^0.1.2",
"dotenv": "^16.3.1",
<<<<<<< HEAD
"electron": "^26.2.2",
"electron-builder": "^24.6.4",
"esbuild": "^0.18.20",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.10.0",
=======
"electron": "26.2.3",
"electron-builder": "^24.6.3",
"esbuild": "^0.18.17",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.9.0",
>>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-license-header": "^0.6.0",
"eslint-plugin-path-alias": "^1.0.0",