diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-02-07 23:51:33 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-02-07 23:56:07 +0100 |
| commit | 97f3e30c3d4081a6765c914c94b6cbf3a75110f3 (patch) | |
| tree | 5ff0d97240d39ab987564154d9d9a3f4a88eebf5 /doc | |
| parent | c6b14a97c57528cbcf5e23e20707e8ec50b7faec (diff) | |
| parent | e0d46f96859b33b3f04791028e30bce4f0173567 (diff) | |
fixing merge conflict
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 1 | ||||
| m--------- | doc/prebuilt | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ec3560713..96bded9ba 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -12,7 +12,6 @@ man_MANS = \ prebuilt/man/taler-aggregator-benchmark.1 \ prebuilt/man/taler-auditor.1 \ prebuilt/man/taler-auditor-dbinit.1 \ - prebuilt/man/taler-auditor-exchange.1 \ prebuilt/man/taler-auditor-httpd.1 \ prebuilt/man/taler-auditor-offline.1 \ prebuilt/man/taler-auditor-sign.1 \ diff --git a/doc/prebuilt b/doc/prebuilt -Subproject bd40be2fd4ce80106dc40a5ac4cc5c169513406 +Subproject 14e26d5fe2c0ceed27e27d8c79db14775ddfd79 |