resolved merge conflicts

Author: lgraubner

.travis.yml

@@ -1,15 +1,7 @@
 language: node_js
 node_js:
-<<<<<<< HEAD
     - "5.1"
     - "5.0"
     - "4.2"
     - "4.1"
     - "4.0"
-=======
-    - "4.2"
-    - "4.1"
-    - "4.0"
-    - "0.12"
-    - "iojs"
->>>>>>> origin/master

package.json

@@ -1,22 +1,12 @@
 {
   "name": "w3c-validator",
-<<<<<<< HEAD
   "version": "3.0.0",
   "description": "Crawls a given site and checks for W3C validity.",
   "homepage": "https://github.com/lgraubner/node-w3c-validator",
   "author": {
     "name": "Lars Graubner",
     "email": "mail@larsgraubner.de",
     "url": "http://larsgraubner.de"
-=======
-  "version": "2.2.1",
-  "description": "Crawls a given site and checks for W3C validity.",
-  "homepage": "https://github.com/lgraubner/node-w3c-validator",
-  "author": {
-      "name": "Lars Graubner",
-      "email": "mail@larsgraubner.de",
-      "url": "http://larsgraubner.de"
->>>>>>> origin/master
   },
   "keywords": [
     "w3c",
@@ -39,19 +29,11 @@
     "lodash": "^3.10.1",
     "cli-spinner": "^0.2.1",
     "find-java-home": "^0.1.2",
-<<<<<<< HEAD
     "url-parse": "^1.0.5"
   },
   "preferGlobal": true,
   "engines": {
     "node": ">=4.0"
-=======
-    "url-parse": "^1.0.4"
-  },
-  "preferGlobal": true,
-  "engines": {
-    "node": ">=0.12"
->>>>>>> origin/master
   },
   "bin": {
     "w3c-validator": "./lib/W3CValidator.js"
@@ -61,12 +43,7 @@
     "test": "NODE_ENV=development mocha test"
   },
   "devDependencies": {
-<<<<<<< HEAD
     "chai": "^3.4.1",
     "mocha": "^2.3.4"
-=======
-    "chai": "^3.4.0",
-    "mocha": "^2.3.3"
->>>>>>> origin/master
   }
 }