[GNUnet-SVN] [taler-merchant] 04/04: merge conflict resolution

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

commit 3b2b43cbab432fd5609f57f38e97699f01df21e3
Merge: 909a9a2 f9b77d3
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Jul 4 23:43:14 2017 +0200

    merge conflict resolution

 src/lib/test_merchant_api.c | 390 ++++++++++++++++++++++++++++++--------------
 1 file changed, 266 insertions(+), 124 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
address@hidden