ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 08:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: resolve conflict

Browse source
This commit is contained in:
minhhn3 2022-10-26 20:50:34 +07:00
commit 3d1237ed53
2 changed files with 2021 additions and 1925 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3941
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

5
package.json
View file

@ -63,7 +63,7 @@
"cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\""
},
"dependencies": {
"@grpc/grpc-js": "^1.6.8",
"@grpc/grpc-js": "^1.7.0",
"@louislam/sqlite3": "15.1.2",
"args-parser": "~1.3.0",
"axios": "~0.27.0",
@ -103,8 +103,7 @@
"pg-connection-string": "~2.5.0",
"prom-client": "~13.2.0",
"prometheus-api-metrics": "~3.2.1",
"protobufjs": "^7.0.0",
"qrcode": "~1.5.0",
"protobufjs": "~7.1.1",
"redbean-node": "0.1.4",
"socket.io": "~4.4.1",
"socket.io-client": "~4.4.1",