Merge branch 'master' of ssh://taler.net/exchange

This commit is contained in:
Christian Grothoff 2016-10-20 15:07:56 +02:00
commit c40a098a91

View File

@ -295,11 +295,6 @@ struct TALER_DepositRequestPS
*/
struct GNUNET_TIME_AbsoluteNBO refund_deadline;
/**
* Deadline for the customer to pay for h_contract
*/
struct GNUNET_TIME_AbsoluteNBO pay_deadline;
/**
* Merchant-generated transaction ID to detect duplicate
* transactions. The merchant must communicate a merchant-unique ID