aboutsummaryrefslogtreecommitdiff
path: root/src/include/taler_merchantdb_plugin.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/taler_merchantdb_plugin.h')
-rw-r--r--src/include/taler_merchantdb_plugin.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/include/taler_merchantdb_plugin.h b/src/include/taler_merchantdb_plugin.h
index 707cf2d9..54432e52 100644
--- a/src/include/taler_merchantdb_plugin.h
+++ b/src/include/taler_merchantdb_plugin.h
@@ -2828,8 +2828,13 @@ 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)
/**