commit 725c51f688f802b30e291cbec580dfca040405ca
parent 1b751d3f8c6bb7efd9b4acd54b4a1bf5266043bf
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 11 Aug 2022 23:37:26 +0200
-fix merge conflict
Diffstat:
1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
@@ -59,11 +59,7 @@ fi
STATUS=$(curl -H "Content-Type: application/json" -X PATCH \
-H 'Authorization: Bearer secret-token:super_secret' \
http://localhost:9966/instances/default/private/ \
-<<<<<<< HEAD
-d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1", "default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us" : 50000000},"default_pay_delay":{"d_us": 60000000}}' \
-=======
- -d "{\"auth\":{\"method\":\"external\"},\"payto_uris\":[\"$FORTYTHREE\"],\"id\":\"default\",\"name\":\"default\",\"address\":{},\"jurisdiction\":{},\"default_max_wire_fee\":\"TESTKUDOS:1\", \"default_max_deposit_fee\":\"TESTKUDOS:1\",\"default_wire_fee_amortization\":1,\"default_wire_transfer_delay\":{\"d_ms\" : 50000},\"default_pay_delay\":{\"d_ms\": 60000}}" \
->>>>>>> 0df2345 (towards libeufin based tests)
-w "%{http_code}" -s -o /dev/null)
if [ "$STATUS" != "204" ]
