exchange

commit 96eae3de890d21921f33f43359c0e8e49acdbcfc
parent 7d1043903cf6d2693e06cb23f8df8bf2705c02bb
Author: Florian Dold <florian@dold.me>
Date:   Mon,  6 Oct 2025 14:57:57 +0200

remove conflict marker in postinstall script

Diffstat:
M
debian/taler-exchange.postinst
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/debian/taler-exchange.postinst b/debian/taler-exchange.postinst
@@ -105,7 +105,6 @@ configure)
               --no-create-home \
               --home ${TALER_HOME} taler-exchange-expire
       adduser --quiet taler-exchange-expire taler-exchange-db
->>>>>>> 1f7ce0e50 (clean up debian package rules, may help with #10453)
   fi
 
   if ! dpkg-statoverride --list /etc/taler-exchange/taler-exchange.conf >/dev/null 2>&1;