first attempt to make travis happy

dnsapi/dns_dynv6.sh

@@ -14,17 +14,14 @@ 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
   fi
-#  if ! _contains "$_your_hosts" "$_host"; then
-#    _debug "The host is $_host and the record $_record"
-#    _debug "Dynv6 returned $_your_hosts"
-#    _err "The host $_host does not exists on your dynv6 account"
-#    return 1
-#  fi
   _debug "found host on your account"
   returnval="$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts \""$_host"\" records set \""$_record"\" txt data \""$txtvalue"\")"
   _debug "Dynv6 returend this after record was added: $returnval"
@@ -53,16 +50,9 @@ dns_dynv6_rm() {
     _err "Host not found on your account"
     return 1
   fi
-#  if ! _contains "$_your_hosts" "$_host"; then
-#    _debug "The host is $_host and the record $_record"
-#   _debug "Dynv6 returned $_your_hosts"
-#    _err "The host $_host does not exists on your dynv6 account"
-#    return 1
-#  fi
   _debug "found host on your account"
   _info "$(ssh -i "$dynv6_keyfile" api@dynv6.com hosts "\"$_host\"" records del "\"$_record\"" txt)"
   return 0
-
 }
 #################### Private functions below ##################################
 #Usage: No Input required