Resolve conflicts

This commit is contained in:
koplo199 2022-11-07 19:17:52 +01:00
parent 4742eefdcc
commit 5951e71047
No known key found for this signature in database
GPG key ID: FBB75767FC87A78A
3 changed files with 2554 additions and 11291 deletions

8
dist/index.js vendored

File diff suppressed because one or more lines are too long

13783
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -29,15 +29,15 @@
}, },
"devDependencies": { "devDependencies": {
"@types/glob": "^8.0.0", "@types/glob": "^8.0.0",
"@types/jest": "^24.0.25", "@types/jest": "^24.9.1",
"@types/mime": "^3.0.1", "@types/mime": "^3.0.1",
"@types/node": "^18.11.9", "@types/node": "^18.11.9",
"@types/node-fetch": "^2.5.12", "@types/node-fetch": "^2.5.12",
"@zeit/ncc": "^0.22.3", "@vercel/ncc": "^0.34.0",
"jest": "^24.9.0", "jest": "^29.3.0",
"jest-circus": "^29.2.2", "jest-circus": "^29.3.0",
"prettier": "2.7.1", "prettier": "2.7.1",
"ts-jest": "^24.3.0", "ts-jest": "^29.0.3",
"typescript": "^4.8.4", "typescript": "^4.8.4",
"typescript-formatter": "^7.2.2" "typescript-formatter": "^7.2.2"
} }