[taler-deployment] branch master updated (c40fa46 -> 8b25f1c)

[gnunet]

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

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

    from c40fa46  Enable buildbot email notifications for active workers
     new d004846  Enable buildbot email notifications for active workers
     new 8b25f1c  Fix master.cfg - Syntax error

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 buildbot/master.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index cfd5d30..a0865f2 100644
--- 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']
 )
 

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