Fix merge artifact in Article::showCssOrJsPage.
authordaniel <daniel.kinzler@wikimedia.de>
Tue, 9 Oct 2012 12:23:42 +0000 (14:23 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Tue, 9 Oct 2012 12:23:42 +0000 (14:23 +0200)
commit1048b0bcb2861feae1c4f3e7bcb6cf4691b67553
treedf9b219177179d0e1949fa130bf0316b34987aad
parent6a2ae3244eb2b8ea9c7dcadb528caca08238913e
Fix merge artifact in Article::showCssOrJsPage.

Change-Id: I1e9608809b81d2c5feeb048ddee96d5324b62a81
includes/Article.php