[taler-donau] branch master updated: resolve merge conflict

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new b68d115  resolve merge conflict
b68d115 is described below

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

    resolve merge conflict
---
 src/include/donaudb_plugin.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index 91cf068..de1f34c 100644
--- 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
 
 };
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.