From 33e3d23c56bdfdb86e4fd5223c094aa53d43fc57 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Tue, 14 Jun 2011 22:51:47 +0000
Subject: [PATCH] Merge conflict fix from r90096.

---
 includes/resourceloader/ResourceLoaderStartUpModule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 83c57f98b8..206affd8d1 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -60,7 +60,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		// to their numerical ids (case insensitive and with underscores)
 		$namespaceIds = $wgContLang->getNamespaceIds();
 		foreach( MWNamespace::getCanonicalNamespaces() as $index => $name ) {
-			$nsIds[$wgContLang->lc( $name )] = $index;
+			$namespaceIds[$wgContLang->lc( $name )] = $index;
 		}
 
 		// Build list of variables
-- 
2.20.1