Merge "Set getEditConflictMainTextBox parameter type to array"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Aug 2018 10:02:18 +0000 (10:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Aug 2018 10:02:18 +0000 (10:02 +0000)

Trivial merge