diff options
Diffstat (limited to 'src/backenddb/plugin_merchantdb_postgres.c')
| -rw-r--r-- | src/backenddb/plugin_merchantdb_postgres.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c index e87021ea..bf9faea0 100644 --- a/src/backenddb/plugin_merchantdb_postgres.c +++ b/src/backenddb/plugin_merchantdb_postgres.c @@ -7800,19 +7800,11 @@ postgres_lookup_all_webhooks (void *cls, * @param next_attempt when we should make the next request to the webhook * @return database result code */ -<<<<<<< HEAD static enum GNUNET_DB_QueryStatus -postgres_update_pending_webhook (void *cls, - uint64_t webhook_serial, - struct GNUNET_TIME_Absolute next_attempt) -// maybe add: http status of failure? -======= - static enum GNUNET_DB_QueryStatus - postgres_update_pending_webhook(void *cls, - uint64_t webhook_serial, - const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb) +postgres_update_pending_webhook(void *cls, + uint64_t webhook_serial, + const struct TALER_MERCHANTDB_PendingWebhookDetails *pwb) // maybe add: http status of failure? ->>>>>>> ee56051c (backend for pending webhook) { struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { |