taler-deployment

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

Fix master.cfg - Syntax error

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

1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -340,7 +340,11 @@ 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']
 )