no supporting HTTP API as well

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 473bb243b39a94d16b6373262ac558b38e5e45a8..dce7ce5faab46bf8300e1d340f2ccb8d3c17a6e8 100644 (file)
--- a/dnsapi/dns_dynv6.sh
+++ b/dnsapi/dns_dynv6.sh
@@ -14,10 +14,6 @@ dns_dynv6_add() {
   _get_keyfile
   _info "using keyfile $dynv6_keyfile"
   _your_hosts="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts)"
-<<<<<<< HEAD
-
-=======
->>>>>>> first attempt to make travis happy
   if ! _get_domain "$fulldomain" "$_your_hosts"; then
     _err "Host not found on your account"
     return 1