[taler-merchant] branch master updated: merge comflict repare

[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 c90a31fb merge comflict repare
c90a31fb is described below

commit c90a31fb906edcc0573c65f86b94eb6e744d5b9e
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Fri Feb 24 12:18:47 2023 -0500

    merge comflict repare
---
 src/backend/taler-merchant-httpd_private-patch-templates-ID.c | 4 ----
 src/backend/taler-merchant-httpd_private-post-templates.c     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_private-patch-templates-ID.c 
b/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
index ad49345e..d5ff8324 100644
--- a/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
@@ -116,11 +116,7 @@ TMH_private_patch_templates_ID (const struct 
TMH_RequestHandler *rh,
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_uint32 ("pos_algorithm",
                                &pos_algorithm),
-<<<<<<< HEAD
-      NULL),
-=======
      0),
->>>>>>> fca9e724 (little correction of code)
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_string ("pos_key",
                                (const char **) &tp.pos_key),
diff --git a/src/backend/taler-merchant-httpd_private-post-templates.c 
b/src/backend/taler-merchant-httpd_private-post-templates.c
index ca6d2af0..00116cba 100644
--- a/src/backend/taler-merchant-httpd_private-post-templates.c
+++ b/src/backend/taler-merchant-httpd_private-post-templates.c
@@ -76,11 +76,7 @@ TMH_private_post_templates (const struct TMH_RequestHandler 
*rh,
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_uint32 ("pos_algorithm",
                                &pos_algorithm),
-<<<<<<< HEAD
-      NULL),
-=======
     0),
->>>>>>> fca9e724 (little correction of code)
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_string ("pos_key",
                                (const char **) &tp.pos_key),

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