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)
commiteb4f08984c62f9c8411aad7b46456207b87bf328
tree60964eb7b1e3c98ec6565b990b04eaf1b89c6bb4
parentf7928ac36df614d8868d35d4d4486671761b5fd2
parenta35adefb266d6ac23b678055653d5d0cc2e18e84
Merge "Extract addition of conflict header explanation"
includes/EditPage.php