diff options
| author | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:44:55 +0100 | 
|---|---|---|
| committer | Özgür Kesim <oec-taler@kesim.org> | 2022-02-18 00:50:31 +0100 | 
| commit | f4f502d037a84a38db4bc21a1db06324a05d26aa (patch) | |
| tree | abd1d813c9e1a9303d60edd3600a9e39f9d3d91a /src/benchmark | |
| parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
| parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
-minor merge conflict resolves
Diffstat (limited to 'src/benchmark')
| -rw-r--r-- | src/benchmark/taler-aggregator-benchmark.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/src/benchmark/taler-aggregator-benchmark.c b/src/benchmark/taler-aggregator-benchmark.c index 6452d6fc..3eb6e7e9 100644 --- a/src/benchmark/taler-aggregator-benchmark.c +++ b/src/benchmark/taler-aggregator-benchmark.c @@ -505,10 +505,10 @@ run (void *cls,      TALER_denom_pub_hash (&denom_pub,                            &h_denom_pub);      make_amountN (2, 0, &issue.properties.value); -    make_amountN (0, 5, &issue.properties.fee_withdraw); -    make_amountN (0, 5, &issue.properties.fee_deposit); -    make_amountN (0, 5, &issue.properties.fee_refresh); -    make_amountN (0, 5, &issue.properties.fee_refund); +    make_amountN (0, 5, &issue.properties.fees.withdraw); +    make_amountN (0, 5, &issue.properties.fees.deposit); +    make_amountN (0, 5, &issue.properties.fees.refresh); +    make_amountN (0, 5, &issue.properties.fees.refund);      issue.properties.denom_hash = h_denom_pub;      if (0 >=          plugin->insert_denomination_info (plugin->cls, | 
