fixed some bad merging on DefaultSettings.php
authorMichael Dale <dale@users.mediawiki.org>
Wed, 15 Jul 2009 00:31:09 +0000 (00:31 +0000)
committerMichael Dale <dale@users.mediawiki.org>
Wed, 15 Jul 2009 00:31:09 +0000 (00:31 +0000)
commitb70eb6f03819a0be1d38488e49241ab0cd894835
tree16bfce390c921ada564abfd7c5249016f420d9e3
parentaefc40d749407714181548f401abde50009c3d0f
fixed some bad merging on DefaultSettings.php
includes/DefaultSettings.php