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 /examples/node/greeter_server.js | |
| parent | 54030dd67f2b67d02d0d894f90eb54c1f5b53358 (diff) | |
| parent | 0862bcf8d8f7759dfcce1de897d8db81fcd5d296 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'examples/node/greeter_server.js')
| -rw-r--r-- | examples/node/greeter_server.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/node/greeter_server.js b/examples/node/greeter_server.js index 44b44afaaf..3600c8bfbf 100644 --- a/examples/node/greeter_server.js +++ b/examples/node/greeter_server.js @@ -33,7 +33,7 @@ var PROTO_PATH = __dirname + '/helloworld.proto'; -var grpc = require('grpc'); +var grpc = require('../../'); var hello_proto = grpc.load(PROTO_PATH).helloworld; /** |