jenkins-bot has submitted this change and it was merged.
Change subject: Merge integration/jenkins-job-builder-config.git
......................................................................
Merge integration/jenkins-job-builder-config.git
Conflicts:
.gitignore
.gitreview
Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f
---
M .gitignore
M .gitreview
2 files changed, 0 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 005e6fb..ef6f216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-<<<<<<< HEAD (7bef36 Merge integration/zuul-config.git)
*.pyc
/.tox
-=======
# Ignore any dotfile ...
.*
# ... but whitelist some:
@@ -12,4 +10,3 @@
*~
*.kate-swp
.*.swp
->>>>>>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory)
diff --git a/.gitreview b/.gitreview
index 537fa96..23f67c4 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,9 +1,5 @@
[gerrit]
host=gerrit.wikimedia.org
port=29418
-<<<<<<< HEAD (7bef36 Merge integration/zuul-config.git)
project=integration/config.git
-=======
-project=integration/jenkins-job-builder-config.git
->>>>>>> BRANCH (9f9691 Move layout to new /jjb/ subdirectory)
defaultbranch=master
--
To view, visit https://gerrit.wikimedia.org/r/166010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25f83f304453c474d5a1187c5f216ebc95870d3f
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
