merchant

commit 39e0e5efa399dc340124923befba529aa032b1e9
parent 792690c849f6fac8c4ccc3edb11b05c04fa42c98
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Mon, 28 Apr 2025 16:39:20 +0200

fixing file

Diffstat:
M
configure.ac
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -18,11 +18,7 @@
 # This configure file is in the public domain
 
 AC_PREREQ([2.69])
-<<<<<<< HEAD
-AC_INIT([taler-merchant],[0.14.9],[taler-bug@gnunet.org])
-=======
 AC_INIT([taler-merchant],[0.14.11],[taler-bug@gnunet.org])
->>>>>>> master
 AC_CONFIG_SRCDIR([src/backend/taler-merchant-httpd.c])
 AC_CONFIG_HEADERS([taler_merchant_config.h])
 # support for non-recursive builds