fixed conflict

1 files changed, 30 insertions, 81 deletions

diff --git a/node_modules/underscore/package.json b/node_modules/underscore/package.json
index 41b4189..44e6afc 100644
--- a/node_modules/underscore/package.json
+++ b/node_modules/underscore/package.json
@@ -1,53 +1,24 @@
 {
-  "_args": [
-    [
-      {
-        "name": "underscore",
-        "raw": "underscore@^1.8.3",
-        "rawSpec": "^1.8.3",
-        "scope": null,
-        "spec": ">=1.8.3 <2.0.0",
-        "type": "range"
-      },
-      "/Users/warefhaque/CSC309/solutions_repo/node_modules/mongo-factory"
-    ]
-  ],
-  "_from": "underscore@>=1.8.3 <2.0.0",
-  "_id": "underscore@1.8.3",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/underscore",
-  "_npmUser": {
-    "email": "jashkenas@gmail.com",
-    "name": "jashkenas"
-  },
-  "_npmVersion": "1.4.28",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "underscore",
-    "raw": "underscore@^1.8.3",
-    "rawSpec": "^1.8.3",
-    "scope": null,
-    "spec": ">=1.8.3 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/mongo-factory"
+  "name": "underscore",
+  "description": "JavaScript's functional programming helper library.",
+  "homepage": "http://underscorejs.org",
+  "keywords": [
+    "util",
+    "functional",
+    "server",
+    "client",
+    "browser"
   ],
-  "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-  "_shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022",
-  "_shrinkwrap": null,
-  "_spec": "underscore@^1.8.3",
-  "_where": "/Users/warefhaque/CSC309/solutions_repo/node_modules/mongo-factory",
   "author": {
-    "email": "jeremy@documentcloud.org",
-    "name": "Jeremy Ashkenas"
+    "name": "Jeremy Ashkenas",
+    "email": "jeremy@documentcloud.org"
   },
-  "bugs": {
-    "url": "https://github.com/jashkenas/underscore/issues"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/jashkenas/underscore.git"
   },
-  "dependencies": {},
-  "description": "JavaScript's functional programming helper library.",
+  "main": "underscore.js",
+  "version": "1.8.3",
   "devDependencies": {
     "docco": "*",
     "eslint": "0.6.x",
@@ -56,48 +27,26 @@
     "qunit-cli": "~0.2.0",
     "uglify-js": "2.4.x"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022",
-    "tarball": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
+  "scripts": {
+    "test": "npm run test-node && npm run lint",
+    "lint": "eslint underscore.js test/*.js",
+    "test-node": "qunit-cli test/*.js",
+    "test-browser": "npm i karma-phantomjs-launcher && ./node_modules/karma/bin/karma start",
+    "build": "uglifyjs underscore.js -c \"evaluate=false\" --comments \"/    .*/\" -m --source-map underscore-min.map -o underscore-min.js",
+    "doc": "docco underscore.js"
   },
+  "license": "MIT",
   "files": [
     "underscore.js",
     "underscore-min.js",
     "underscore-min.map",
     "LICENSE"
   ],
-  "gitHead": "e4743ab712b8ab42ad4ccb48b155034d02394e4d",
-  "homepage": "http://underscorejs.org",
-  "keywords": [
-    "util",
-    "functional",
-    "server",
-    "client",
-    "browser"
-  ],
-  "license": "MIT",
-  "main": "underscore.js",
-  "maintainers": [
-    {
-      "email": "jashkenas@gmail.com",
-      "name": "jashkenas"
-    }
-  ],
-  "name": "underscore",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jashkenas/underscore.git"
-  },
-  "scripts": {
-    "build": "uglifyjs underscore.js -c \"evaluate=false\" --comments \"/    .*/\" -m --source-map underscore-min.map -o underscore-min.js",
-    "doc": "docco underscore.js",
-    "lint": "eslint underscore.js test/*.js",
-    "test": "npm run test-node && npm run lint",
-    "test-browser": "npm i karma-phantomjs-launcher && ./node_modules/karma/bin/karma start",
-    "test-node": "qunit-cli test/*.js"
+  "readme": "                       __\n                      /\\ \\                                                         __\n     __  __    ___    \\_\\ \\     __   _ __   ____    ___    ___   _ __    __       /\\_\\    ____\n    /\\ \\/\\ \\ /' _ `\\  /'_  \\  /'__`\\/\\  __\\/ ,__\\  / ___\\ / __`\\/\\  __\\/'__`\\     \\/\\ \\  /',__\\\n    \\ \\ \\_\\ \\/\\ \\/\\ \\/\\ \\ \\ \\/\\  __/\\ \\ \\//\\__, `\\/\\ \\__//\\ \\ \\ \\ \\ \\//\\  __/  __  \\ \\ \\/\\__, `\\\n     \\ \\____/\\ \\_\\ \\_\\ \\___,_\\ \\____\\\\ \\_\\\\/\\____/\\ \\____\\ \\____/\\ \\_\\\\ \\____\\/\\_\\ _\\ \\ \\/\\____/\n      \\/___/  \\/_/\\/_/\\/__,_ /\\/____/ \\/_/ \\/___/  \\/____/\\/___/  \\/_/ \\/____/\\/_//\\ \\_\\ \\/___/\n                                                                                  \\ \\____/\n                                                                                   \\/___/\n\nUnderscore.js is a utility-belt library for JavaScript that provides\nsupport for the usual functional suspects (each, map, reduce, filter...)\nwithout extending any core JavaScript objects.\n\nFor Docs, License, Tests, and pre-packed downloads, see:\nhttp://underscorejs.org\n\nUnderscore is an open-sourced component of DocumentCloud:\nhttps://github.com/documentcloud\n\nMany thanks to our contributors:\nhttps://github.com/jashkenas/underscore/contributors\n",
+  "readmeFilename": "README.md",
+  "bugs": {
+    "url": "https://github.com/jashkenas/underscore/issues"
   },
-  "version": "1.8.3"
+  "_id": "underscore@1.8.3",
+  "_from": "underscore@"
 }