From 6f14e110647f7828352f48521f4985e36f4585d8 Mon Sep 17 00:00:00 2001 From: priscilla Date: Fri, 24 Feb 2023 12:06:19 -0500 Subject: 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(+) (limited to 'src') 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), -- cgit v1.2.3