resolve conflicts

This commit is contained in:
Alex Holliday committed 2026-03-03 22:04:59 +00:00
commit 298018035d
12 files changed
+820 -176

No files matched your search

+4 -1
View File
@@ -80,6 +80,8 @@
"@types/ping": "0.4.4",
"@types/swagger-ui-express": "4.1.8",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.56.1",
"@typescript-eslint/parser": "^8.56.1",
"c8": "10.1.3",
"eslint": "^9.17.0",
"eslint-plugin-mocha": "^10.5.0",
@@ -93,6 +95,7 @@
"ts-node": "^10.9.2",
"tsc-alias": "1.8.16",
"tsx": "4.20.5",
"typescript": "5.9.2"
"typescript": "5.9.2",
"typescript-eslint": "^8.56.1"
}
}