diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-07 12:37:58 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-07 12:37:58 -0700 |
| commit | 8d5396aac17012492a54c17c1215440f8109aa2d (patch) | |
| tree | 5771137593d6abea196c6a575b0006123ef4c912 /src/node/index.js | |
| parent | 54030dd67f2b67d02d0d894f90eb54c1f5b53358 (diff) | |
| parent | 0862bcf8d8f7759dfcce1de897d8db81fcd5d296 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'src/node/index.js')
| -rw-r--r-- | src/node/index.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/node/index.js b/src/node/index.js index 02b73f66ee..c49fdc8431 100644 --- a/src/node/index.js +++ b/src/node/index.js @@ -43,7 +43,7 @@ var server = require('./src/server.js'); var Metadata = require('./src/metadata.js'); -var grpc = require('bindings')('grpc'); +var grpc = require('bindings')('grpc_node'); /** * Load a gRPC object from an existing ProtoBuf.Reflect object. @@ -90,7 +90,6 @@ exports.load = function load(filename, format) { default: throw new Error('Unrecognized format "' + format + '"'); } - return loadObject(builder.ns); }; |