From 0d4904f05dd9356a72caf7f5941bdcbdd975c654 Mon Sep 17 00:00:00 2001
From: StefanAbl <st.ablassmeier@pm.me>
Date: Mon, 13 Jul 2020 15:42:45 +0200
Subject: [PATCH] no supporting HTTP API as well

---
 dnsapi/dns_dynv6.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dnsapi/dns_dynv6.sh b/dnsapi/dns_dynv6.sh
index 473bb243..dce7ce5f 100644
--- 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