Fixed merge error
authorTim Starling <tstarling@users.mediawiki.org>
Fri, 21 Nov 2003 02:43:12 +0000 (02:43 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Fri, 21 Nov 2003 02:43:12 +0000 (02:43 +0000)
commit283d0b8836b52df8675216c23307a3c44661aca7
treee2baa56ac28ccceb31da37dff8f2ef705eda9dc6
parent3f51fd55bde86e0e6316a5c8b87593e3b465d214
Fixed merge error
includes/Setup.php