diff options
| author | priscilla <priscilla.huang@efrei.net> | 2023-02-24 12:18:47 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2023-02-24 12:18:47 -0500 |
| commit | c90a31fb906edcc0573c65f86b94eb6e744d5b9e (patch) | |
| tree | da350ce176b49d5d76a4f607d8d3c3a7f0d2fd9f /src/backend/taler-merchant-httpd_private-patch-templates-ID.c | |
| parent | 6f14e110647f7828352f48521f4985e36f4585d8 (diff) | |
merge comflict repare
Diffstat (limited to 'src/backend/taler-merchant-httpd_private-patch-templates-ID.c')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-patch-templates-ID.c | 4 |
1 files changed, 0 insertions, 4 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), |