[taler-donau] 02/02: solve merge conflict

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

commit 4865637d8b7cb6bf6321dda192716d0f701f288b
Merge: 49393f5 aedec9e
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Mon Jan 1 22:52:38 2024 +0100

    solve merge conflict

 src/donau-tools/Makefile.am               |   2 +-
 src/donau/donau-httpd.c                   | 180 ++++++++-----------
 src/donau/donau-httpd.h                   |   5 +-
 src/donau/donau-httpd_keys.c              | 142 ++++-----------
 src/donaudb/test_donaudb.c                |  72 +-------
 src/include/donaudb_plugin.h              |   5 +-
 src/lib/donau_api_batch_submit_receipts.c |   5 -
 src/pq/pq_common.h                        |  48 -----
 src/pq/pq_query_helper.c                  | 282 ------------------------------
 src/testing/test_donau_api.c              |   1 -
 10 files changed, 122 insertions(+), 620 deletions(-)

diff --cc src/donau/donau-httpd_keys.c
index 9c17fa7,cdd62a4..c2f04f7
--- a/src/donau/donau-httpd_keys.c
+++ b/src/donau/donau-httpd_keys.c
@@@ -53,14 -51,14 +52,16 @@@ struct HelperDenominatio
    /**
     * When will the helper start to use this key for signing?
     */
 -  // struct GNUNET_TIME_Timestamp start_time;
 +  struct GNUNET_TIME_Timestamp start_time;
 +
+ 
    /**
     * For how long will the helper allow signing? 0 if
     * the key was revoked or purged.
     */
 -  // struct GNUNET_TIME_Relative validity_duration;
 +  struct GNUNET_TIME_Relative validity_duration;
 +
+ 
    /**
     * Hash of the full denomination key.
     */

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.