[reclaim-ui] 249/459: fix conflict

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit 165867070041c2377b21f6679ab6a0335ef0b8bf
Merge: 6732561 5695f3c
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Mon Jul 27 13:13:25 2020 +0200

    fix conflict

 src/app/attestation.service.ts                     | 20 +++++++++--
 .../edit-attestations.component.html               |  2 +-
 .../edit-attestations.component.ts                 | 41 +++++++++++++++++++---
 3 files changed, 55 insertions(+), 8 deletions(-)


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