diff options
author | Javier Sepulveda <javier.sepulveda@uv.es> | 2023-03-10 11:07:18 +0100 |
---|---|---|
committer | Javier Sepulveda <javier.sepulveda@uv.es> | 2023-03-10 11:07:18 +0100 |
commit | 8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd (patch) | |
tree | 398b642f43a09e5523e7baf04d77b871d58c6317 /buildbot | |
parent | d004846711563ba98fca9f138359d6f06700d5b8 (diff) | |
parent | c40fa46f06fc683b938e5666aba525b609cda550 (diff) | |
download | deployment-8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd.tar.gz deployment-8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd.tar.bz2 deployment-8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd.zip |
Fix master.cfg - Syntax error
Diffstat (limited to 'buildbot')
-rw-r--r-- | buildbot/master.cfg | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg index f4a7317..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'] ) |