Merge "editpage: Make TextConflictHelper::toEditContent private"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 29 Apr 2019 09:08:44 +0000 (09:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 29 Apr 2019 09:08:44 +0000 (09:08 +0000)
commitacab9b7bd5d6336cb4acc9e98c437f9601d8978b
treec727bc1574680844bf3e35e39f6b06bc0dcdcf87
parentb1ebe0ba8a8998f9cfc27e3d54390d1253b2b55d
parent81fee5a5e96fbd0a6cecad75028ef643e0459d98
Merge "editpage: Make TextConflictHelper::toEditContent private"