Merge "Extract addition of conflict header explanation"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 9 Nov 2016 17:04:37 +0000 (17:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 9 Nov 2016 17:04:37 +0000 (17:04 +0000)
1  2 
includes/EditPage.php

Simple merge