diff options
Diffstat (limited to 'bench/exchange_benchmark_home/.config/taler/account-2.json~')
| -rw-r--r-- | bench/exchange_benchmark_home/.config/taler/account-2.json~ | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bench/exchange_benchmark_home/.config/taler/account-2.json~ b/bench/exchange_benchmark_home/.config/taler/account-2.json~ new file mode 100644 index 0000000..2abb776 --- /dev/null +++ b/bench/exchange_benchmark_home/.config/taler/account-2.json~ @@ -0,0 +1,10 @@ +{ + "url": "payto://x-taler-bank/localhost:8082/2", +<<<<<<< Updated upstream + "salt": "6TBY14X6YB6D0J2PGKQX0VVV30118QEQG1R3PYP1GG5XWXHST3ZQ1J3R6EQ85HZXS8DFDTRJN6JGBT8KDQFT0KVFPMGXTWHWC7E1518", + "master_sig": "CET51EPQGW01BVQMFXQKYW0BMWGQJJT7QTMGNW1FXYC6T6AB1CRK14S5PH5V34JDX7J8JJPVNV3VKXKH4CM1SVRQTFC5QVVDMJ3JM30" +======= + "salt": "PM2T91BE8JK056D9041ZYDX1DSTAQ1YQNBXKVPMHDM8QRMEKKM7KYC1MPPT4J4PDFSG0R8DQZV982NS2TB9MF8PAVQZT8WN96H025J8", + "master_sig": "T881WQKDTNKQP5XCQHR2HD5QYPCPNZJ327W6GH1QQF2NRCH22JQWBKHNPKK6K8T6CNVNJ2E3XHR25X7RCAJ9YAEQRG9235J42JPRE20" +>>>>>>> Stashed changes +}
\ No newline at end of file |