Merge github.com:justmwa/acme.sh

Conflicts:
	dnsapi/README.md
	dnsapi/dns_nsone.sh

README.md

@@ -324,6 +324,7 @@ 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/)

dnsapi/README.md

@@ -494,7 +494,8 @@ be reused when needed.
 If you have any issues with this integration please report them to
 https://github.com/pho3nixf1re/acme.sh/issues.
 
-## 26. Use NS1.com API
+<<<<<<< HEAD
+## 28. Use NS1.com API
 
 ```
 export NS1_Key="fdmlfsdklmfdkmqsdfk"
@@ -504,6 +505,8 @@ Ok, let's issue a cert now:
 ```
 acme.sh --issue --dns dns_nsone -d example.com -d www.example.com
 ```
+=======
+>>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
 
 # Use custom API
 

dnsapi/dns_nsone.sh

@@ -1,4 +1,6 @@
-#!/bin/bash
+<<<<<<< HEAD
+#!/usr/bin/env sh
+>>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
 
 # bug reports to dev@1e.ca