fix conflicts

metrico · Jan 24, 2024 · e081cb0 · e081cb0
1 parent bffac94
commit e081cb0
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,9 @@
     "xxhash-wasm": "^0.4.2",
     "yaml": "^1.10.2",
     "@stricjs/utils": "^1.6.1",
-    "basic-auth": "^2.0.1"
+    "basic-auth": "^2.0.1",
+    "google-protobuf": "^3.21.2",
+    "@grpc/grpc-js": "^1.9.14"
   },
   "devDependencies": {
     "@elastic/elasticsearch": "^8.5.0",