resolve conflict

googleapis · Jul 20, 2023 · 3b091d0 · 3b091d0
1 parent 137a1a9
commit 3b091d0
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/package.json b/package.json
@@ -21,11 +21,7 @@
     "ecdsa-sig-formatter": "^1.0.11",
     "gaxios": "^6.0.0",
     "gcp-metadata": "^6.0.0",
-<<<<<<< HEAD
-    "gtoken": "^7.0.0",
-=======
-    "gtoken": "^7.0.1",
->>>>>>> e37ad67 (build: add fixes to test)
+    "gtoken":  "^7.0.0",
     "jws": "^4.0.0",
     "lru-cache": "^6.0.0"
   },