Correct edits to README.md this time

6 years ago · cd3ef8fa5a
parent 72ce37704b
commit cd3ef8fa5a
1 changed files with 3 additions and 4 deletions
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@ -1056,7 +1056,6 @@ Now you can issue a certificate.
 acme.sh --issue --dns dns_namecheap -d example.com -d *.example.com
 ```

-<<<<<<< HEAD
 ## 54. Use MyDNS.JP API

 First, register to MyDNS.JP and get MasterID and Password.