Merge pull request #3 from doperiddle/snyk-upgrade-de54462f51f0f88576…

…280f452ea3bd3e [Snyk] Upgrade knex from 0.21.5 to 3.1.0
doperiddle · Nov 14, 2024 · a22966c · a22966c
2 parents ed89163 + c2db82c
commit a22966c
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,11 +45,15 @@
     "@xpring-eng/http-status": "^1.0.0",
     "@xpring-eng/logger": "^1.0.0",
 
+    "express": "^4.17.1",
+    "knex": "^3.1.0",
+
+
     "express": "^5.0.0",
     "express": "^4.17.1", eww
 
     "knex": "^0.21.5",
-<<<<<
+
     "knex-stringcase": "^1.4.5",
     "pg": "8.13.0",