chore(package.json): merge

BranchMetrics · Aug 3, 2016 · e22023a · e22023a
1 parent b2040c4
commit e22023a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -57,12 +57,8 @@
     "node-version-compare": "^1.0.1",
     "plist": "^1.2.0",
     "rimraf": "^2.5.2",
-<<<<<<< HEAD
-    "xml2js": "^0.4.16"
-=======
     "xml2js": "^0.4.16",
     "semantic-release": "^4.3.5"
->>>>>>> a2eb241e001c0187abd1a71e3da908959cacc749
   },
   "config": {
     "commitizen": {