Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-14 23:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflict

Browse Source
This commit is contained in:
Maciej Błędkowski
2020-09-02 05:47:53 +02:00
committed by GitHub
parent c191132a01
commit 0c9573ae4c
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package.json
View File

@@ -19,17 +19,10 @@
"@types/firefox-webext-browser": "70.0.1",
"@types/jest": "^24.0.23",
"@types/jquery": "^3.3.31",
<<<<<<< HEAD
"copy-webpack-plugin": "^5.0.5",
"jest": "^26.2.2",
"rimraf": "^3.0.0",
"ts-jest": "^26.1.4",
=======
"copy-webpack-plugin": "^6.0.3",
"jest": "^26.4.0",
"rimraf": "^3.0.0",
"ts-jest": "^26.2.0",
>>>>>>> 3ec3a011281f946b749335aafaf5aad8d64d7422
"ts-loader": "^6.2.1",
"typescript": "~3.7.3",
"web-ext": "^5.0.0",