From: Erik Moeller <erik@users.mediawiki.org>
Date: Sat, 28 Feb 2004 03:23:52 +0000 (+0000)
Subject: oops, removing old version
X-Git-Tag: 1.3.0beta1~927
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=c00e9915967498ce93230951f4e05ad2887efd6d;p=lhc%2Fweb%2Fwiklou.git

oops, removing old version
---

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index d731370939..6da89df8f5 100755
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -111,16 +111,11 @@ function initialiseMessages( $overwrite = false) {
 	}
 	print "Done\n";
 	print "Writing...";
-<<<<<<< InitialiseMessages.inc
-	print $sql;
-	wfQuery( $sql, DB_WRITE, $fname );
-=======
 
 	if ( !$first ) {
 		wfQuery( $sql, DB_WRITE, $fname );
 	}
 
->>>>>>> 1.7
 	print "Done\n";
 
 	$navText .= "</table>";