donau

commit b68d11520c89300cb8f78242b007fabadf26a15d
parent 55b5eb66483b7e7c7113483cabf12c6e6166199a
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date:   Wed, 27 Mar 2024 11:58:35 +0100

resolve merge conflict

Diffstat:
M
src/include/donaudb_plugin.h
 | 
6
------

1 file changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
@@ -110,15 +110,9 @@ struct DONAUDB_IssuedReceiptsMetaData
   size_t num_sig;
 
   /**
-<<<<<<< HEAD
    * Array of blinded signatures
    */
   struct DONAU_BlindedDonationUnitSignature *blinded_sig;
-  ====== =
-    *Charity signature
-    *
-    / struct DONAU_BlindedDonationUnitSignature **blinded_sig;
-  >> >> >> > refs / remotes / origin / master
 
 };