[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-deployment] branch master updated: Fix git conflict
From: |
gnunet |
Subject: |
[taler-deployment] branch master updated: Fix git conflict |
Date: |
Fri, 10 Mar 2023 11:12:35 +0100 |
This is an automated email from the git hooks/post-receive script.
javier-sepulveda pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new a31b2e2 Fix git conflict
a31b2e2 is described below
commit a31b2e2f35ea957f3297a9b3dbe5a41fc635785b
Author: Javier Sepulveda <javier.sepulveda@uv.es>
AuthorDate: Fri Mar 10 11:12:22 2023 +0100
Fix git conflict
---
buildbot/master.cfg | 4 ----
1 file changed, 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']
)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-deployment] branch master updated: Fix git conflict,
gnunet <=