diff options
author | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
---|---|---|
committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 16:50:32 +0100 |
commit | a67786078bb3617ea8d4d308b21781fd0a1c2258 (patch) | |
tree | 67d476fe3e096001997f6de77d1db92bcd643bbb /src/exchange/taler-exchange-httpd_csr.c | |
parent | 8674f32aec8113ced6b2c2be625728b31158fff8 (diff) |
resolves merge conflicts
Diffstat (limited to 'src/exchange/taler-exchange-httpd_csr.c')
-rw-r--r-- | src/exchange/taler-exchange-httpd_csr.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/exchange/taler-exchange-httpd_csr.c b/src/exchange/taler-exchange-httpd_csr.c index dfe4d4d0..fbad543c 100644 --- a/src/exchange/taler-exchange-httpd_csr.c +++ b/src/exchange/taler-exchange-httpd_csr.c @@ -94,7 +94,6 @@ TEH_handler_csr (struct TEH_RequestContext *rc, return TEH_RESPONSE_reply_expired_denom_pub_hash ( rc->connection, &denom_pub_hash, - GNUNET_TIME_timestamp_get (), TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED, "CSR"); } @@ -105,7 +104,6 @@ TEH_handler_csr (struct TEH_RequestContext *rc, return TEH_RESPONSE_reply_expired_denom_pub_hash ( rc->connection, &denom_pub_hash, - GNUNET_TIME_timestamp_get (), TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE, "CSR"); } @@ -115,7 +113,6 @@ TEH_handler_csr (struct TEH_RequestContext *rc, return TEH_RESPONSE_reply_expired_denom_pub_hash ( rc->connection, &denom_pub_hash, - GNUNET_TIME_timestamp_get (), TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED, "CSR"); } |