Skip to content

Commit

Permalink
Merge branch 'master' into gae-zone
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinBeckwith authored Nov 1, 2018
2 parents 4c37bd4 + adb9f3d commit a5a8324
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"gcp-metadata": "^0.9.0",
"google-auth-library": "^2.0.0",
"google-gax": "^0.20.0",
"google-proto-files": "^0.17.0",
"is": "^3.2.1",
"lodash.merge": "^4.6.1",
"on-finished": "^2.3.0",
Expand Down Expand Up @@ -120,7 +119,6 @@
"nock": "^10.0.1",
"nyc": "^13.0.1",
"power-assert": "^1.6.0",
"propprop": "^0.3.1",
"proxyquire": "^2.1.0",
"typescript": "~3.1.0",
"uuid": "^3.3.2"
Expand Down

0 comments on commit a5a8324

Please sign in to comment.