fix bug 41280, show correct content when displaying edit conflicts
authoraude <aude.wiki@gmail.com>
Tue, 23 Oct 2012 09:52:58 +0000 (09:52 +0000)
committeraude <aude.wiki@gmail.com>
Tue, 23 Oct 2012 09:52:58 +0000 (09:52 +0000)
commite80f3311d2cd81b0541834f78f7da6bf29f02270
tree662c6ab7eedf3f035f06a876d79484b791374837
parenta5e33a4295d5a24b54058f245ce1f2fdacf2eaf8
fix bug 41280, show correct content when displaying edit conflicts

Change-Id: I52522c06d20ddab85799dc33a0d07c10603a20a7
includes/EditPage.php