diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-14 13:17:07 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-14 13:17:07 -0700 |
| commit | e13bfc0139b4ddb560ee3a0e085dbf518a5dabe5 (patch) | |
| tree | 14b2fe1741a9f8ef706eed8c4759b9266c1442ac /src/node/interop | |
| parent | bfebdec3f79e413a9e822796d8e260a39fabec85 (diff) | |
| parent | 3a2b2235234fe5cf151f963dc11a760c71641287 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/node/interop')
| -rw-r--r-- | src/node/interop/interop_server.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/interop/interop_server.js b/src/node/interop/interop_server.js index ece22cce31..1242a0f939 100644 --- a/src/node/interop/interop_server.js +++ b/src/node/interop/interop_server.js @@ -194,7 +194,7 @@ if (require.main === module) { }); var server_obj = getServer(argv.port, argv.use_tls === 'true'); console.log('Server attaching to port ' + argv.port); - server_obj.server.listen(); + server_obj.server.start(); } /** |