Resolved merge conflicts

narzolliam · Oct 7, 2015 · 2756fde · 2756fde
2 parents 4de94d4 + 504cc5e
commit 2756fde
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 463 deletions.
diff --git a/package.json b/package.json
@@ -38,8 +38,7 @@
  "jshint": "^2.5.0",
  "minimist": "^1.1.0",
  "mocha": "~1.21.0",
- "mustache": "^2.0.0",
- "strftime": "^0.8.2"
+ "mustache": "^2.0.0"
  },
  "engines": {
  "node": ">=0.10.13"
@@ -48,14 +47,9 @@
  "LICENSE",
  "src/node/README.md",
  "src/node/index.js",
- "src/node/bin",
- "src/node/cli",
- "src/node/examples",
  "src/node/ext",
  "src/node/health_check",
- "src/node/interop",
  "src/node/src",
- "src/node/test",
  "src/core",
  "test/proto",
  "include",

diff --git a/src/node/bin/README.md b/src/node/bin/README.md
diff --git a/src/node/bin/service_packager b/src/node/bin/service_packager
diff --git a/src/node/cli/service_packager.js b/src/node/cli/service_packager.js
diff --git a/src/node/cli/service_packager/index.js b/src/node/cli/service_packager/index.js
diff --git a/src/node/cli/service_packager/package.json.template b/src/node/cli/service_packager/package.json.template
diff --git a/src/node/examples/stock.proto b/src/node/examples/stock.proto
diff --git a/src/node/examples/stock_client.js b/src/node/examples/stock_client.js