From dff641a665bffab928ebf0121ff15e86a608de96 Mon Sep 17 00:00:00 2001
From: nytral <justmwa@users.noreply.github.com>
Date: Mon, 8 May 2017 16:07:45 +0200
Subject: [PATCH] I can do it... just discovered vmdiff

---
 README.md           | 1 -
 dnsapi/README.md    | 5 +----
 dnsapi/dns_nsone.sh | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a67a9061..b816ec7f 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,6 @@ You don't have to do anything manually!
 1. Domain-Offensive/Resellerinterface/Domainrobot API
 1. Gandi LiveDNS API
 1. Knot DNS API
-1. NS1.com API
 1. DigitalOcean API (native)
 1. ClouDNS.net API
 1. Infoblox NIOS API (https://www.infoblox.com/)
diff --git a/dnsapi/README.md b/dnsapi/README.md
index 25ba1c34..dff62399 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -494,8 +494,7 @@ be reused when needed.
 If you have any issues with this integration please report them to
 https://github.com/pho3nixf1re/acme.sh/issues.
 
-<<<<<<< HEAD
-## 28. Use NS1.com API
+## 26. Use NS1.com API
 
 ```
 export NS1_Key="fdmlfsdklmfdkmqsdfk"
@@ -505,8 +504,6 @@ Ok, let's issue a cert now:
 ```
 acme.sh --issue --dns dns_nsone -d example.com -d www.example.com
 ```
-=======
->>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
 
 # Use custom API
 
diff --git a/dnsapi/dns_nsone.sh b/dnsapi/dns_nsone.sh
index ced65ac0..0f6e441a 100644
--- a/dnsapi/dns_nsone.sh
+++ b/dnsapi/dns_nsone.sh
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 #!/usr/bin/env sh
->>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
 
 # bug reports to dev@1e.ca