Add tracking for resolved conflicts
authorWMDE-Fisch <christoph.jauera@wikimedia.de>
Wed, 28 Jun 2017 07:15:46 +0000 (09:15 +0200)
committerWMDE-Fisch <christoph.jauera@wikimedia.de>
Wed, 28 Jun 2017 13:51:58 +0000 (13:51 +0000)
commitf50cb9abaeaa5fd964b3d155624c3803093fb677
tree381250762c031854080d5d13250ee7f300727df8
parent8ddf721b6feaf11c67aafc1445d255e68faa4007
Add tracking for resolved conflicts

Bug: T167863
Change-Id: I48bbfc7216d1f726dbcec3ae337466bbf8b2a486
includes/EditPage.php