From a4fdac98dd5ae76a59f6b4692ba05bbfb3958b56 Mon Sep 17 00:00:00 2001
From: Chetan Karande <kchetan.tech@gmail.com>
Date: Sun, 7 Sep 2014 13:05:12 -0400
Subject: [PATCH] Update package.json

---
 package.json | 86 ++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 6a896e3bf..7c9eaefa3 100644
--- a/package.json
+++ b/package.json
@@ -1,47 +1,39 @@
-{
-  "name": "owasp-nodejs-goat",
-  "version": "0.0.1",
-  "description": "A tool to learn OWASP Top 10 for node.js developers",
-  "main": "server.js",
-  "dependencies": {
-    "bcrypt-nodejs": "~0.0.3",
-    "consolidate": "~0.9.1",
-    "express": ">=3.x",
-    "mongodb": "~1.3.9",
-    "swig": "~0.14.0",
-    "validator": "~1.1.3",
-<<<<<<< HEAD
-    "underscore": "latest",
-    "grunt": "latest",
-    "grunt-cli": "latest",
-    "grunt-env": "latest",
-    "forever": "latest",
-=======
-    "underscore": "1.5.2",
-    "grunt": "latest",
-    "grunt-cli": "latest",
-    "grunt-env": "latest",
-    "forever": "0.10.9",
->>>>>>> 648b7f49975e91ce6cdfdabc158002f82c30cf68
-    "helmet": "~0.1.2"
-  },
-  "engines": {
-    "node": "0.10.x",
-    "npm": "1.2.x"
-  },
-  "scripts": {
-    "start": "node node_modules/grunt-cli/bin/grunt",
-    "test": "node node_modules/grunt-cli/bin/grunt test"
-  },
-  "devDependencies": {
-    "grunt-contrib-watch": "0.5.3",
-    "grunt-contrib-jshint": "0.7.2",
-    "grunt-nodemon": "0.1.2",
-    "grunt-concurrent": "0.4.2",
-    "grunt-mocha-test": "0.8.1",
-    "grunt-jsbeautifier": "~0.2.3"
-  },
-  "repository": "https://github.com/OWASP/NodejsGoat",
-  "license": "Apache 2.0",
-  "private": true
-}
+  {
+    "name": "owasp-nodejs-goat",
+    "version": "0.0.1",
+    "description": "A tool to learn OWASP Top 10 for node.js developers",
+    "main": "server.js",
+    "dependencies": {
+      "bcrypt-nodejs": "~0.0.3",
+      "consolidate": "~0.9.1",
+      "express": ">=3.x",
+      "mongodb": "~1.3.9",
+      "swig": "~0.14.0",
+      "validator": "~1.1.3",
+      "underscore": "1.5.2",
+      "grunt": "latest",
+      "grunt-cli": "latest",
+      "grunt-env": "latest",
+      "forever": "0.10.9",
+      "helmet": "~0.1.2"
+    },
+    "engines": {
+      "node": "0.10.x",
+      "npm": "1.2.x"
+    },
+    "scripts": {
+      "start": "node node_modules/grunt-cli/bin/grunt",
+      "test": "node node_modules/grunt-cli/bin/grunt test"
+    },
+    "devDependencies": {
+      "grunt-contrib-watch": "0.5.3",
+      "grunt-contrib-jshint": "0.7.2",
+      "grunt-nodemon": "0.1.2",
+      "grunt-concurrent": "0.4.2",
+      "grunt-mocha-test": "0.8.1",
+      "grunt-jsbeautifier": "~0.2.3"
+    },
+    "repository": "https://github.com/OWASP/NodejsGoat",
+    "license": "Apache 2.0",
+    "private": true
+  }