From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 29 Apr 2019 09:08:44 +0000 (+0000)
Subject: Merge "editpage: Make TextConflictHelper::toEditContent private"
X-Git-Tag: 1.34.0-rc.0~1855
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=acab9b7bd5d6336cb4acc9e98c437f9601d8978b;p=lhc%2Fweb%2Fwiklou.git

Merge "editpage: Make TextConflictHelper::toEditContent private"
---

acab9b7bd5d6336cb4acc9e98c437f9601d8978b