exchange

commit e2f536b4090a74eb79cce4ed5f5be59916d5c545
parent a684a90366275bdc4114d2bfb8dea57a2ee59890
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 27 Mar 2025 14:51:52 +0100

-fix merge

Diffstat:
M
src/exchangedb/Makefile.am
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am
@@ -160,12 +160,8 @@ libtaler_plugin_exchangedb_postgres_la_SOURCES = \
   pg_create_tables.h pg_create_tables.c \
   pg_delete_aggregation_transient.h pg_delete_aggregation_transient.c \
   pg_delete_shard_locks.h pg_delete_shard_locks.c \
-<<<<<<< HEAD
   pg_disable_rules.h pg_disable_rules.c \
-  pg_do_age_withdraw.h pg_do_age_withdraw.c \
-=======
   pg_do_withdraw.h pg_do_withdraw.c \
->>>>>>> 2e17389c8 (implementation for /withdraw endpoint ready)
   pg_do_batch_withdraw.h pg_do_batch_withdraw.c \
   pg_do_batch_withdraw_insert.h pg_do_batch_withdraw_insert.c \
   pg_do_check_deposit_idempotent.h pg_do_check_deposit_idempotent.c \