diff options
| author | priscilla <priscilla.huang@efrei.net> | 2023-02-24 12:06:19 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2023-02-24 12:06:19 -0500 |
| commit | 6f14e110647f7828352f48521f4985e36f4585d8 (patch) | |
| tree | e707f694df70607fd16895b5fccf33eb1d57b3e3 | |
| parent | ad213bfb192d6efb3e1bcfcd095b34fbbbe0efa2 (diff) | |
little correction of code
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-patch-templates-ID.c | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-templates.c | 4 |
2 files changed, 8 insertions, 0 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 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), |