Extract addition of conflict header explanation
authorWMDE-Fisch <christoph.fischer@wikimedia.de>
Thu, 27 Oct 2016 13:49:49 +0000 (15:49 +0200)
committerWMDE-Fisch <christoph.jauera@wikimedia.de>
Wed, 9 Nov 2016 16:22:11 +0000 (16:22 +0000)
commita35adefb266d6ac23b678055653d5d0cc2e18e84
tree043ecba7136414a67829161449ef0d418b62581e
parentea60bd7c46f2ccc866829f06919ad87e5ca9de53
Extract addition of conflict header explanation

This is done so it can be altered when using an alternative EditPage.

Bug: T143823
Change-Id: I31f5f2b7d35806a11925fb00e3272cac47c783ec
includes/EditPage.php