From c00e9915967498ce93230951f4e05ad2887efd6d Mon Sep 17 00:00:00 2001
From: Erik Moeller <erik@users.mediawiki.org>
Date: Sat, 28 Feb 2004 03:23:52 +0000
Subject: [PATCH] oops, removing old version

---
 maintenance/InitialiseMessages.inc | 5 -----
 1 file changed, 5 deletions(-)

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>";
-- 
2.20.1