[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-docs] 02/03: merge conflict
|
From: |
gnunet |
|
Subject: |
[taler-docs] 02/03: merge conflict |
|
Date: |
Tue, 26 Jan 2021 12:07:37 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository docs.
commit 9fa2be0bf07201742e0c9eda1424b8a72151296f
Merge: 1ae896e 678c18f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jan 26 12:05:48 2021 +0100
merge conflict
frags/installing-debian.rst | 2 +-
index.rst | 3 +-
libeufin/nexus-tutorial.rst | 115 ++++++++++++++++-----------
manpages/taler-exchange-benchmark.1.rst | 2 +-
manpages/taler-exchange-dbinit.1.rst | 2 +-
manpages/taler-exchange-httpd.1.rst | 2 +-
manpages/taler.conf.5.rst | 4 +-
taler-developer-manual.rst | 2 +-
taler-exchange-manual.rst | 52 ++++++------
taler-merchant-manual.rst | 11 +--
taler-wallet-cli-manual.rst | 136 ++++++++++++++++++++++++++++++++
taler-wallet.rst | 4 +-
12 files changed, 247 insertions(+), 88 deletions(-)
diff --cc index.rst
index c64f8c8,9486220..5fa291f
--- a/index.rst
+++ b/index.rst
@@@ -60,7 -60,8 +60,8 @@@ Documentation Overvie
taler-bank-manual
taler-backoffice-manual
taler-auditor-manual
- taler-developer-manual.rst
+ taler-developer-manual
+ taler-wallet
design-documents/index
anastasis
libeufin/index
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.