diff options
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-post-templates.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-templates.c | 4 |
1 files changed, 4 insertions, 0 deletions
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), |