Conflicts:
	dnsapi/dns_dp.sh
This commit is contained in:
Bastian Bittorf 2017-01-09 14:58:05 +01:00
commit c53500a4e6

View File

@ -199,7 +199,11 @@ _get_root() {
#Usage: method URI data
_rest() {
<<<<<<< HEAD
m="$1" # method e.g. GET|POST|PUT|DELETE
=======
export m=$1 # e.g. GET|POST
>>>>>>> db75015a49bba555cd1f46de00a9fbf9a07aa562
ep="$2"
data="$3"