From 8d2e9c51f627b06d881edf8fdd3b510b357de2f8 Mon Sep 17 00:00:00 2001 From: Dallon Feldner Date: Tue, 7 May 2013 11:53:25 -0700 Subject: [PATCH] Update package.json Added merge as a dependency --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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"