diff options
Diffstat (limited to 'src/include/taler_merchantdb_plugin.h')
| -rw-r--r-- | src/include/taler_merchantdb_plugin.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h index 54432e52..434b82ef 100644 --- a/src/include/taler_merchantdb_plugin.h +++ b/src/include/taler_merchantdb_plugin.h @@ -2828,13 +2828,8 @@ struct TALER_MERCHANTDB_Plugin enum GNUNET_DB_QueryStatus (*update_pending_webhook)(void *cls, uint64_t webhook_serial, -<<<<<<< HEAD - struct GNUNET_TIME_Absolute next_attempt); - // maybe add: http status of failure? -======= const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb); // maybe add: http status of failure? ->>>>>>> ee56051c (backend for pending webhook) /** |