merchant

commit eae7563b5c0cd3072ef35296f0cf6ac9080f84ce
parent 725c51f688f802b30e291cbec580dfca040405ca
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 11 Aug 2022 23:40:13 +0200

-fix merge conflict

Diffstat:
M
src/testing/test_merchant_transfer_tracking.sh
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
@@ -65,11 +65,7 @@ TUTORIAL_PAYTO=`get_payto_uri tutorial x`
 STATUS=$(curl -H "Content-Type: application/json" -X POST \
     -H 'Authorization: Bearer secret-token:super_secret' \
     http://localhost:9966/management/instances \
-<<<<<<< HEAD
     -d '{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/Survey","payto://x-taler-bank/localhost:8082/Tutorial"],"id":"test","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\":[\"$SURVEY_PAYTO\",\"$TUTORIAL_PAYTO\"],\"id\":\"test\",\"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" ]