merged

nulltask · nulltask · commit 767f76536a91 · 2012-05-07T21:14:12.000+09:00
diff --git a/package.json b/package.json
@@ -18,10 +18,7 @@
   "devDependencies": {
     "browserbuild": "*",
     "connect": "1.x",
-<<<<<<< HEAD
     "uglify-js": "*",
-=======
->>>>>>> master
     "mocha": "*",
     "should": "*"
   },
