Fix #1570 : php 4.2.x error on conflict merging
authorAntoine Musso <hashar@users.mediawiki.org>
Fri, 4 Mar 2005 12:55:37 +0000 (12:55 +0000)
committerAntoine Musso <hashar@users.mediawiki.org>
Fri, 4 Mar 2005 12:55:37 +0000 (12:55 +0000)
commite24061460b83e876b1fa62078db9cc5945802779
tree3f081788e94e30b26fc348b8a659c84c2a028b95
parentf4c6d815fd3805763181768d5dd518dd321c7c51
Fix #1570 : php 4.2.x error on conflict merging
includes/GlobalFunctions.php