[taler-merchant] branch master updated: update

[gnunet]

This is an automated email from the git hooks/post-receive script.

priscilla-huang pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new c5413074 update
c5413074 is described below

commit c541307441f8e50770919c0105264f4cf6676619
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Mon Jan 23 08:39:44 2023 -0500

    update
---
 src/backenddb/plugin_merchantdb_postgres.c | 14 +++-----------
 src/include/taler_merchantdb_plugin.h      |  5 -----
 2 files changed, 3 insertions(+), 16 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[] = {
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)
 
 
   /**

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.