From 31631b2b2879f49b4458461b1ec1fb79d32dfb42 Mon Sep 17 00:00:00 2001
From: Brian Ford
Date: Wed, 3 Jul 2013 11:10:23 -0700
Subject: chore(build): add check for merge conflicts, ddescribe, and iit

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'package.json')

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": [
     {
-- 
cgit v1.2.3