Merge pull request #256 from murgatroid99/v1.10.x_upmerge

V1.10.x upmerge
2018-04-04 16:45:24 -07:00 · 2018-04-04 16:45:24 -07:00 · 0dfd199c38
parent 799aee603d 763a48f6fb
commit 0dfd199c38
2 changed files with 2 additions and 2 deletions
--- a/packages/grpc-native-core/build.yaml
+++ b/packages/grpc-native-core/build.yaml
@ -1,2 +1,2 @@
 settings:
-  '#': It's possible to have node_version here as a key to override the core's version.
+  '#': It's possible to have node_version here as a key to override the core's version.
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@ -29,7 +29,7 @@
  ],
  "dependencies": {
    "lodash": "^4.15.0",
-    "nan": "^2.10.0",
+    "nan": "^2.0.0",
    "node-pre-gyp": "0.7.0",
    "protobufjs": "^5.0.0"
  },