Removing a conflict that's been commited by accident. Thanks to Nikerabbit for the...
authorLeon Weber <leon@users.mediawiki.org>
Sat, 3 May 2008 22:59:58 +0000 (22:59 +0000)
committerLeon Weber <leon@users.mediawiki.org>
Sat, 3 May 2008 22:59:58 +0000 (22:59 +0000)
commitc827bc09d0325c827ec4d3e1f44083d42d5586e7
tree6c733eb52e694103fa38742a1b6acebfb9464e35
parent36ac110c53a84b80cf2186f84690817f931a3dc4
Removing a conflict that's been commited by accident. Thanks to Nikerabbit for the hint.
languages/messages/MessagesDe_formal.php