resolve conflicts

This commit is contained in:
Stefan Seidel 2017-02-19 21:46:33 +00:00
parent 2b2b65fe18
commit abf4278d09

View File

@ -240,7 +240,6 @@ acme.sh --issue --dns dns_ispconfig -d example.com -d www.example.com
The `ISPC_User`, `ISPC_Password`, `ISPC_Api`and `ISPC_Api_Insecure` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
<<<<<<< HEAD
## 13. Use Alwaysdata domain API
First you need to login to your Alwaysdata account to get your API Key.