diff --git a/package.json b/package.json index be72ea0f..a28175ba 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "debug": "latest", "express": "~3.1.1", "jugglingdb": "~0.2.0-30", - "asteroid-module-loader": "git+ssh://git@github.com:strongloop/asteroid-module-loader.git" + "asteroid-module-loader": "git+ssh://git@github.com:strongloop/asteroid-module-loader.git", + "merge": "~1.1.0" }, "devDependencies": { "mocha": "latest"