README.md

@@ -10,12 +10,8 @@ Now supports **Let's Encrypt v2**!!
 | [greenlock-cluster](https://git.coolaj86.com/coolaj86/greenlock-cluster.js)
 | [greenlock-koa](https://git.coolaj86.com/coolaj86/greenlock-koa.js)
 | [greenlock-hapi](https://git.coolaj86.com/coolaj86/greenlock-hapi.js)
-<<<<<<< HEAD
-| Sponsored by [ppl](https://ppl.family). Created at [Daplie](https://dapliefounder.com).
-=======
 
 | Sponsored by [ppl](https://ppl.family)
->>>>>>> 84e21d2385da4e2260befd1c91ac4564e1e21301
 
 Automatic [Let's Encrypt](https://letsencrypt.org) (ACME) HTTPS / TLS / SSL Certificates for node.js
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "greenlock",
-  "version": "2.2.2",
+  "version": "2.2.1",
   "description": "Let's Encrypt for node.js on npm",
   "main": "index.js",
   "scripts": {
@@ -56,7 +56,7 @@
   },
   "optionalDependencies": {},
   "dependencies": {
-    "acme-v2": "^1.0.2",
+    "acme-v2": "git+https://git.coolaj86.com/coolaj86/acme-v2.js.git#master",
     "asn1js": "^1.2.12",
     "bluebird": "^3.0.6",
     "certpem": "^1.0.0",
@@ -70,9 +70,5 @@
     "node.extend": "^1.1.5",
     "pkijs": "^1.3.27",
     "rsa-compat": "^1.2.1"
-  },
-  "gitDependencies": {
-    "acme-v2": "git+https://git.coolaj86.com/coolaj86/acme-v2.js.git#v1.0",
-    "le-acme-core": "git+https://git.coolaj86.com/coolaj86/le-acme-core.js.git#v2.1"
   }
 }