[taler-donau] 02/02: resolve merge

[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 41f7458bfcbc73e859a060b525898f8381910cc3
Merge: d07e6e7 6c56bb6
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
AuthorDate: Sun Jan 14 21:49:11 2024 +0100

    resolve merge

 src/donau/Makefile.am                              |   2 +
 src/donau/donau-httpd_get-charities.c              |  18 ++-
 src/donau/donau-httpd_get-charity.c                |  13 +-
 ...t-charity.c => donau-httpd_get-history-entry.c} |  35 +++--
 ...d_get-charities.c => donau-httpd_get-history.c} |  65 ++++----
 src/donau/donau-httpd_history.h                    |  51 ++++++
 src/donaudb/Makefile.am                            |   1 +
 src/donaudb/pg_get_charities.c                     |  26 +++-
 .../{pg_get_charities.c => pg_get_history.c}       |  62 ++++----
 src/donaudb/pg_get_history.h                       |  39 +++++
 src/donaudb/pg_helper.h                            |  10 +-
 src/donaudb/pg_lookup_charity.c                    |  18 ++-
 src/donaudb/plugin_donaudb_postgres.c              |  39 ++---
 src/include/donaudb_plugin.h                       | 171 ++++++++++++++++++++-
 14 files changed, 435 insertions(+), 115 deletions(-)

diff --cc src/donau/donau-httpd_get-charities.c
index 71abbc9,f571c92..39f9ce8
--- a/src/donau/donau-httpd_get-charities.c
+++ b/src/donau/donau-httpd_get-charities.c
@@@ -22,10 -22,9 +22,9 @@@
  #include <gnunet/gnunet_util_lib.h>
  #include <jansson.h>
  #include <microhttpd.h>
- #include <pthread.h>
 -#include "taler/taler_json_lib.h"
 -#include "taler/taler_mhd_lib.h"
 -#include "taler/taler_signatures.h"
 +#include <taler/taler_json_lib.h>
 +#include <taler/taler_mhd_lib.h>
 +#include <taler/taler_signatures.h>
  #include "donau-httpd.h"
  #include "donaudb_plugin.h"
  #include "donau-httpd_charity.h"

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