From 681970b0d9d528190271bb997340cd21834865b6 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 19 Mar 2010 21:18:11 +0000
Subject: [PATCH] Followup r63914, function must match parent

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

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 6d2ea3b988..59c924ccc0 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -51,7 +51,7 @@ class SpecialMergeHistory extends SpecialPage {
 		}
 	}
 
-	function execute( $par = '' ) {
+	function execute( $par ) {
 		global $wgOut, $wgRequest, $wgUser;
 
 		if( !$this->userCanExecute( $wgUser ) ) {
-- 
2.20.1