Swapped to a different merge module

gaffa-tape · Sep 28, 2014 · 4c5274a · 4c5274a
1 parent e3703b3
commit 4c5274a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gel.js b/gel.js
@@ -1,6 +1,6 @@
 var Lang = require('lang-js'),
     paths = require('gedi-paths'),
-    merge = require('merge'),
+    merge = require('clean-merge'),
     createNestingParser = Lang.createNestingParser,
     detectString = Lang.detectString,
     Token = Lang.Token,

diff --git a/package.json b/package.json
@@ -26,9 +26,9 @@
     "node": ">=0.6"
   },
   "dependencies": {
+    "clean-merge": "^1.0.0",
     "gedi-paths": "^1.0.0",
     "lang-js": "^2.0.0",
-    "merge": "^1.1.3",
     "spec-js": "0.0.x"
   },
   "keywords": [