[taler-merchant] branch master updated: little correction of code

[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 6f14e110 little correction of code
6f14e110 is described below

commit 6f14e110647f7828352f48521f4985e36f4585d8
Author: priscilla <priscilla.huang@efrei.net>
AuthorDate: Fri Feb 24 12:06:19 2023 -0500

    little correction of code
---
 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 insertions(+)

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 b5938368..ad49345e 100644
--- a/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
+++ b/src/backend/taler-merchant-httpd_private-patch-templates-ID.c
@@ -116,7 +116,11 @@ 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 276e225f..ca6d2af0 100644
--- a/src/backend/taler-merchant-httpd_private-post-templates.c
+++ b/src/backend/taler-merchant-httpd_private-post-templates.c
@@ -76,7 +76,11 @@ 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.