diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-11-07 14:39:15 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-11-07 14:39:15 +0100 |
commit | 1d740824fa8914e21c402abefc5f3d5a8cdfa4ca (patch) | |
tree | 74223d7b8931806183f5b5d8b09222c00d8a62c7 /src/exchange-lib/exchange_api_common.c | |
parent | 6d6a9dac39bd6c24a7d527186aaa2a1eec2d8c36 (diff) | |
parent | 247b8e33b3ea20407910929c78232ff0d44e8d9a (diff) |
resolving merge issue
Diffstat (limited to 'src/exchange-lib/exchange_api_common.c')
-rw-r--r-- | src/exchange-lib/exchange_api_common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/exchange-lib/exchange_api_common.c b/src/exchange-lib/exchange_api_common.c index acf90fce..a531b1c3 100644 --- a/src/exchange-lib/exchange_api_common.c +++ b/src/exchange-lib/exchange_api_common.c @@ -20,7 +20,6 @@ * @author Christian Grothoff */ #include "platform.h" -#include "exchange_api_common.h" #include "taler_json_lib.h" #include <gnunet/gnunet_curl_lib.h> #include "exchange_api_handle.h" @@ -38,8 +37,8 @@ */ int TALER_EXCHANGE_verify_coin_history (const char *currency, - const struct TALER_CoinSpendPublicKeyP *coin_pub, - json_t *history, + const struct TALER_CoinSpendPublicKeyP *coin_pub, + json_t *history, struct TALER_Amount *total) { size_t len; |