diff options
| author | Florian Dold <florian.dold@gmail.com> | 2020-05-13 20:44:02 +0530 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2020-05-13 20:44:02 +0530 |
| commit | c6e6ea0d7e0253e7e395465db188c3c315399cb2 (patch) | |
| tree | 37a83fc14206b720186ecdc2e45d573de50a7139 /libeufin/index.rst | |
| parent | c8db85cc9900c42a84ad0d09456f2e6e9931c672 (diff) | |
| download | docs-c6e6ea0d7e0253e7e395465db188c3c315399cb2.tar.gz docs-c6e6ea0d7e0253e7e395465db188c3c315399cb2.tar.bz2 docs-c6e6ea0d7e0253e7e395465db188c3c315399cb2.zip | |
resolve merge, oops
Diffstat (limited to 'libeufin/index.rst')
| -rw-r--r-- | libeufin/index.rst | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libeufin/index.rst b/libeufin/index.rst index f8d3a985..35dc7814 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 |