[taler-deployment] 02/02: Fix master.cfg - Syntax error

[gnunet]

This is an automated email from the git hooks/post-receive script.

javier-sepulveda pushed a commit to branch master
in repository deployment.

commit 8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd
Merge: d004846 c40fa46
Author: Javier Sepulveda <javier.sepulveda@uv.es>
AuthorDate: Fri Mar 10 11:07:18 2023 +0100

    Fix master.cfg - Syntax error

 buildbot/master.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc buildbot/master.cfg
index f4a7317,cfd5d30..a0865f2
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@@ -340,7 -340,7 +340,11 @@@ sphinxErrorNotifier = reporters.MailNot
     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']
  )
  

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.