fix: conflicts after merging main

streamyard · Feb 23, 2024 · e9e090a · e9e090a
2 parents cc8e124 + 9f1f9e3
commit e9e090a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -143,7 +143,11 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
+<<<<<<< HEAD
     "@google-cloud/spanner": "^5.18.0",
+=======
+    "@streamyard/spanner": "^7.3.0-2",
+>>>>>>> main
     "@sap/hana-client": "^2.12.25",
     "better-sqlite3": "^7.1.2 || ^8.0.0",
     "hdb-pool": "^0.1.6",