fix: funky merge cockup

Signed-off-by: Simon Bailey <simon@newtriks.com>
This commit is contained in:
Simon Bailey
2015-04-27 19:50:59 +01:00
parent 9965e4cfaf
commit 9b4cd44ce9
+3 -1
View File
@@ -32,7 +32,9 @@
}, },
"devDependencies": { "devDependencies": {
"mocha": "^1.21.4", "mocha": "^1.21.4",
"underscore.string": "^2.3.3" "underscore.string": "^2.3.3",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13"
}, },
"peerDependencies": { "peerDependencies": {
"yo": ">=1.2.0" "yo": ">=1.2.0"