diff options
| author | Javier Sepulveda <javier.sepulveda@uv.es> | 2023-03-10 11:12:22 +0100 |
|---|---|---|
| committer | Javier Sepulveda <javier.sepulveda@uv.es> | 2023-03-10 11:12:22 +0100 |
| commit | a31b2e2f35ea957f3297a9b3dbe5a41fc635785b (patch) | |
| tree | e638630f10392552e87b0fca0c70293bdb7d65d3 | |
| parent | 8b25f1cf7c2c62ef0e9fff86cf440cf64cdad6bd (diff) | |
| download | deployment-a31b2e2f35ea957f3297a9b3dbe5a41fc635785b.tar.gz deployment-a31b2e2f35ea957f3297a9b3dbe5a41fc635785b.tar.bz2 deployment-a31b2e2f35ea957f3297a9b3dbe5a41fc635785b.zip | |
Fix git conflict
| -rw-r--r-- | buildbot/master.cfg | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/buildbot/master.cfg b/buildbot/master.cfg index a0865f2..f4a7317 100644 --- 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'] ) |