taler-deployment

commit a31b2e2f35ea957f3297a9b3dbe5a41fc635785b
parent 8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd
Author: Javier Sepulveda <javier.sepulveda@uv.es>
Date:   Fri, 10 Mar 2023 11:12:22 +0100

Fix git conflict

Diffstat:
M
buildbot/master.cfg
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -340,11 +340,7 @@ sphinxErrorNotifier = reporters.MailNotifier(
    useTls=True,
    # notify if sphinx exits with error (command line option in Makefile turns warnings into exit 1)
    mode=('failing'),
-<<<<<<< HEAD
    builders=['doc-builder',],
-=======
-   builders=('doc-builder',),
->>>>>>> c40fa46f06fc683b938e5666aba525b609cda550
    extraRecipients=['sphinxerrors@taler.net']
 )