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/exchange/taler-exchange-httpd_management_post_keys.c | |
| parent | a78b3345fbf017b1cddfd09afb4b2c29287b0bba (diff) | |
| parent | 22fe5da700df7328de183470c1c7f59b21c9f4f9 (diff) | |
| download | exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.tar.gz exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.tar.bz2 exchange-f4f502d037a84a38db4bc21a1db06324a05d26aa.zip | |
-minor merge conflict resolves
Diffstat (limited to 'src/exchange/taler-exchange-httpd_management_post_keys.c')
| -rw-r--r-- | src/exchange/taler-exchange-httpd_management_post_keys.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/exchange/taler-exchange-httpd_management_post_keys.c b/src/exchange/taler-exchange-httpd_management_post_keys.c index c353a9959..2e48497a5 100644 --- a/src/exchange/taler-exchange-httpd_management_post_keys.c +++ b/src/exchange/taler-exchange-httpd_management_post_keys.c @@ -187,10 +187,7 @@ add_keys (void *cls, meta.expire_deposit, meta.expire_legal, &meta.value, - &meta.fee_withdraw, - &meta.fee_deposit, - &meta.fee_refresh, - &meta.fee_refund, + &meta.fees, &TEH_master_public_key, &d->master_sig)) { |