diff3 cleanups, from callek
authorRiver Tarnell <kateturner@users.mediawiki.org>
Fri, 1 Jul 2005 09:25:31 +0000 (09:25 +0000)
committerRiver Tarnell <kateturner@users.mediawiki.org>
Fri, 1 Jul 2005 09:25:31 +0000 (09:25 +0000)
commitcd197294b2e3318ee35cd9fea00355bdbed8e1cf
tree589267102f205b7af27f38025807175fd4d45f22
parent6180a3fda27edc7ec5be9b7f8a3af0c05ac8a18b
diff3 cleanups, from callek
config/index.php