[taler-docs] branch master updated: resolve merge, oops

[gnunet]

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

dold pushed a commit to branch master
in repository docs.

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

commit c6e6ea0d7e0253e7e395465db188c3c315399cb2
Author: Florian Dold <address@hidden>
AuthorDate: Wed May 13 20:44:02 2020 +0530

    resolve merge, oops
---
 libeufin/index.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libeufin/index.rst b/libeufin/index.rst
index f8d3a98..35dc781 100644
--- a/libeufin/index.rst
+++ b/libeufin/index.rst
@@ -7,14 +7,8 @@ LibEuFin is a project providing free software tooling for 
European FinTech.
   :glob:
 
   concepts
-<<<<<<< Updated upstream
-  ebics
-  api-sandbox
-  api-nexus
-=======
   bank-transport-ebics
   api-nexus2
   api-sandbox
   ebics
->>>>>>> Stashed changes
   iso20022

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