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_admin.c | |
| parent | 6d6a9dac39bd6c24a7d527186aaa2a1eec2d8c36 (diff) | |
| parent | 247b8e33b3ea20407910929c78232ff0d44e8d9a (diff) | |
resolving merge issue
Diffstat (limited to 'src/exchange-lib/exchange_api_admin.c')
| -rw-r--r-- | src/exchange-lib/exchange_api_admin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/exchange-lib/exchange_api_admin.c b/src/exchange-lib/exchange_api_admin.c index 524916e6..e6cb8101 100644 --- a/src/exchange-lib/exchange_api_admin.c +++ b/src/exchange-lib/exchange_api_admin.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015 GNUnet e.V. + Copyright (C) 2014, 2015, 2016 GNUnet e.V. TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -129,6 +129,7 @@ handle_admin_add_incoming_finished (void *cls, } aai->cb (aai->cb_cls, response_code, + TALER_JSON_get_error_code (json), json); TALER_EXCHANGE_admin_add_incoming_cancel (aai); } |