fixed conflict

1 files changed, 241 insertions, 0 deletions

diff --git a/node_modules/jsdom/package.json b/node_modules/jsdom/package.json
new file mode 100644
index 0000000..8256e74
--- /dev/null
+++ b/node_modules/jsdom/package.json
@@ -0,0 +1,241 @@
+{
+  "name": "jsdom",
+  "version": "3.1.2",
+  "description": "A JavaScript implementation of the DOM and HTML standards",
+  "keywords": [
+    "dom",
+    "html",
+    "whatwg",
+    "w3c"
+  ],
+  "maintainers": [
+    {
+      "name": "tmpvar",
+      "email": "tmpvar@gmail.com"
+    },
+    {
+      "name": "domenic",
+      "email": "domenic@domenicdenicola.com"
+    }
+  ],
+  "contributors": [
+    {
+      "name": "Vincent Greene",
+      "email": "ulteriorlife@gmail.com"
+    },
+    {
+      "name": "Dav Glass",
+      "email": "davglass@gmail.com"
+    },
+    {
+      "name": "Felix Gnass",
+      "email": "fgnass@gmail.com"
+    },
+    {
+      "name": "Charlie Robbins",
+      "email": "charlie.robbins@gmail.com"
+    },
+    {
+      "name": "Aria Stewart",
+      "email": "aredridel@nbtsc.org"
+    },
+    {
+      "name": "Matthew",
+      "url": "http://github.com/matthewpflueger/"
+    },
+    {
+      "name": "Olivier El Mekki",
+      "email": "unknown",
+      "url": "http://blog.olivier-elmekki.com/"
+    },
+    {
+      "name": "Shimon Dookdin",
+      "email": "helpmepro1@gmail.com"
+    },
+    {
+      "name": "Daniel Cassidy",
+      "email": "mail@danielcassidy.me.uk",
+      "url": "http://www.danielcassidy.me.uk/"
+    },
+    {
+      "name": "Sam Ruby",
+      "url": "http://intertwingly.net/blog/"
+    },
+    {
+      "name": "hij1nx",
+      "url": "http://github.com/hij1nx"
+    },
+    {
+      "name": "Yonathan Randolph",
+      "url": "http://github.com/yonran"
+    },
+    {
+      "name": "Martin Davis",
+      "url": "http://github.com/waslogic"
+    },
+    {
+      "name": "Andreas Lind Petersen",
+      "email": "andreas@one.com"
+    },
+    {
+      "name": "d-ash",
+      "url": "http://github.com/d-ash"
+    },
+    {
+      "name": "Robin Zhong",
+      "email": "fbzhong@gmail.com"
+    },
+    {
+      "name": "Alexander Flatter",
+      "email": "flatter@gmail.com"
+    },
+    {
+      "name": "Heng Liu",
+      "email": "liucougar@gmail.com"
+    },
+    {
+      "name": "Brian McDaniel",
+      "url": "http://github.com/brianmcd"
+    },
+    {
+      "name": "John Hurliman",
+      "email": "jhurliman@jhurliman.org"
+    },
+    {
+      "name": "Jimmy Mabey"
+    },
+    {
+      "name": "Gregory Tomlinson"
+    },
+    {
+      "name": "Jason Davies",
+      "url": "http://www.jasondavies.com/"
+    },
+    {
+      "name": "Josh Marshall",
+      "url": "http://www.ponderingtheobvious.com/"
+    },
+    {
+      "name": "Jason Priestley",
+      "url": "https://github.com/jhp"
+    },
+    {
+      "name": "Derek Lindahl",
+      "url": "https://github.com/dlindahl"
+    },
+    {
+      "name": "Chris Roebuck",
+      "email": "chris@quillu.com",
+      "url": "http://www.quillu.com"
+    },
+    {
+      "name": "Avi Deitcher",
+      "url": "https://github.com/deitch"
+    },
+    {
+      "name": "Nao Iizuka",
+      "email": "iizuka@kyu-mu.net",
+      "url": "https://github.com/iizukanao"
+    },
+    {
+      "name": "Peter Perenyi",
+      "url": "https://github.com/sinegar"
+    },
+    {
+      "name": "Tiago Rodrigues",
+      "email": "tmcrodrigues@gmail.com",
+      "url": "http://trodrigues.net"
+    },
+    {
+      "name": "Samori Gorse",
+      "email": "samorigorse@gmail.com",
+      "url": "http://github.com/shinuza"
+    },
+    {
+      "name": "John Roberts",
+      "email": "jroberts@logitech.com"
+    },
+    {
+      "name": "Chad Walker",
+      "email": "chad@chad-cat-lore-eddie.com",
+      "url": "https://github.com/chad3814"
+    },
+    {
+      "name": "Zach Smith",
+      "email": "x.coder.zach@gmail.com",
+      "url": "https://github.com/xcoderzach"
+    }
+  ],
+  "license": {
+    "type": "MIT",
+    "url": "http://github.com/tmpvar/jsdom/blob/master/LICENSE.txt"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tmpvar/jsdom"
+  },
+  "dependencies": {
+    "browser-request": ">= 0.3.1 < 0.4.0",
+    "contextify": ">= 0.1.9 < 0.2.0",
+    "cssom": ">= 0.3.0 < 0.4.0",
+    "cssstyle": ">= 0.2.21 < 0.3.0",
+    "htmlparser2": ">= 3.7.3 < 4.0.0",
+    "nwmatcher": ">= 1.3.4 < 2.0.0",
+    "parse5": ">= 1.3.1 < 2.0.0",
+    "request": ">= 2.44.0 < 3.0.0",
+    "xml-name-validator": "^1.0.0",
+    "xmlhttprequest": ">= 1.6.0 < 2.0.0",
+    "acorn-globals": "^1.0.2",
+    "acorn": "0.11.0",
+    "escodegen": "^1.6.1"
+  },
+  "devDependencies": {
+    "browserify": "^8.1.3",
+    "colors": "^0.6.2",
+    "http-server": "^0.6.1",
+    "jshint": "^2.5.0",
+    "multiline": "^1.0.1",
+    "nodeunit": "~0.8.0",
+    "optimist": "*",
+    "portfinder": "^0.2.1",
+    "q": "^1.0.1",
+    "selenium-standalone": "^2.42.0-2.9.0",
+    "urlmaster": ">=0.2.15",
+    "wd": "^0.2.21"
+  },
+  "browser": {
+    "canvas": false,
+    "contextify": "./lib/jsdom/contextify-shim.js",
+    "request": "browser-request"
+  },
+  "scripts": {
+    "pretest": "git submodule update --init --recursive",
+    "test": "node ./test/runner",
+    "test-browser": "node ./test/browser-runner",
+    "lint": "jshint lib/ && jshint test/"
+  },
+  "main": "./lib/jsdom",
+  "files": [
+    "lib/"
+  ],
+  "gitHead": "39633c67c33f5ca9628a85f7c0df6a8a09595999",
+  "bugs": {
+    "url": "https://github.com/tmpvar/jsdom/issues"
+  },
+  "homepage": "https://github.com/tmpvar/jsdom",
+  "_id": "jsdom@3.1.2",
+  "_shasum": "88e5fe2d3b45b628a153011e2aa0ead7f395b19c",
+  "_from": "jsdom@3.1.2",
+  "_npmVersion": "2.1.2",
+  "_nodeVersion": "0.10.36",
+  "_npmUser": {
+    "name": "domenic",
+    "email": "domenic@domenicdenicola.com"
+  },
+  "dist": {
+    "shasum": "88e5fe2d3b45b628a153011e2aa0ead7f395b19c",
+    "tarball": "https://registry.npmjs.org/jsdom/-/jsdom-3.1.2.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/jsdom/-/jsdom-3.1.2.tgz"
+}