jenkins-bot has submitted this change and it was merged.
Change subject: Merge integration/zuul-config.git
......................................................................
Merge integration/zuul-config.git
Conflicts:
.gitreview
Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95
---
M .gitreview
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitreview b/.gitreview
index 1702a37..23f67c4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,9 +1,5 @@
[gerrit]
host=gerrit.wikimedia.org
port=29418
-<<<<<<< HEAD (377105 Initial .gitreview file)
project=integration/config.git
-=======
-project=integration/zuul-config.git
->>>>>>> BRANCH (1b2537 Dummy jobs for integration/config)
defaultbranch=master
--
To view, visit https://gerrit.wikimedia.org/r/166009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b67781746c411c4e7c2acb0400fec2a069c8c95
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
