merchant

Merchant backend to process payments, run by merchants
Log | Files | Refs | Submodules | README | LICENSE
commit a5966706dd3ea74d5386e15ef95865239545a08d
parent d099b5bb1ee69de357e77cbc169492b876cdf85c
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Tue, 11 Feb 2025 16:40:32 +0100

no idea what is going on

Diffstat:

Msrc/include/taler_merchant_util.h | 4----


1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/include/taler_merchant_util.h b/src/include/taler_merchant_util.h
@@ -54,11 +54,7 @@ enum TALER_MERCHANT_ContractVersion
 /**
  * Possible token kinds.
  */
-<<<<<<< HEAD
-enum TALER_TALER_MERCHANT_ContractTokenKind
-=======
 enum TALER_MERCHANT_ContractTokenKind
->>>>>>> master
 {
   /**
    * Token kind invalid