[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add TwoColConflict to make-wmf-branch

2017-01-19 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332906 ) Change subject: Add TwoColConflict to make-wmf-branch .. Add TwoColConflict to make-wmf-branch Bug: T150184 Change-Id: I9b98086

[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add TwoColConflict to make-wmf-branch

2017-01-18 Thread Addshore (Code Review)
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332906 ) Change subject: Add TwoColConflict to make-wmf-branch .. Add TwoColConflict to make-wmf-branch Bug: T150184 Change-Id: I9b980860977833d3a3