diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-07 13:53:58 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-07 13:53:58 -0700 |
| commit | 2756fdef07b971a6cb8c606168a75f5a11d8644d (patch) | |
| tree | d1aea9610e129cc4aeecb2ce80db26cb4bdfe428 /src/node/test/surface_test.js | |
| parent | 4de94d41d27b0c204eac9cabdb439b142d086e1f (diff) | |
| parent | 504cc5e3d06aee004f1f09b81776d52a37e6e67b (diff) | |
Resolved merge conflicts
Diffstat (limited to 'src/node/test/surface_test.js')
| -rw-r--r-- | src/node/test/surface_test.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/test/surface_test.js b/src/node/test/surface_test.js index ecbe0dfa67..395ea887ec 100644 --- a/src/node/test/surface_test.js +++ b/src/node/test/surface_test.js @@ -41,7 +41,7 @@ var ProtoBuf = require('protobufjs'); var grpc = require('..'); -var math_proto = ProtoBuf.loadProtoFile(__dirname + '/../examples/math.proto'); +var math_proto = ProtoBuf.loadProtoFile(__dirname + '/math/math.proto'); var mathService = math_proto.lookup('math.Math'); |