Merge "Moved textbox1 building into TextConflictHelper on edit conflicts"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Jan 2018 21:56:45 +0000 (21:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Jan 2018 21:56:45 +0000 (21:56 +0000)

Trivial merge