diff options
| author | Brian Ford | 2013-07-03 11:10:23 -0700 |
|---|---|---|
| committer | Igor Minar | 2013-07-11 11:38:34 -0700 |
| commit | 31631b2b2879f49b4458461b1ec1fb79d32dfb42 (patch) | |
| tree | 1549169fcd9c0e2248959f8c555146a4f5edf4f1 /package.json | |
| parent | 03216760ec858f3257e4e009a40f7f9a62b41510 (diff) | |
| download | angular.js-31631b2b2879f49b4458461b1ec1fb79d32dfb42.tar.bz2 | |
chore(build): add check for merge conflicts, ddescribe, and iit
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json index 3b39cea0..6ed6c68c 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,9 @@ "showdown": "0.3.1", "rewire": "1.1.3", "grunt-contrib-jasmine-node": "~0.1.1", - "grunt-parallel": "~0.2.0" + "grunt-parallel": "~0.2.0", + "grunt-ddescribe-iit": "~0.0.1", + "grunt-merge-conflict": "~0.0.1" }, "licenses": [ { |