From 4ff5d7aadfe3d812e08168d456cc87db7cae6eec Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Tue, 8 Nov 2016 06:10:33 +0100 Subject: [PATCH] Remove conflict markers from LinkTitles_Special.php - FIX: Prevent syntax error when accessing special page. Closes #9. --- includes/LinkTitles_Special.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/includes/LinkTitles_Special.php b/includes/LinkTitles_Special.php index b02e5eb..aada402 100644 --- a/includes/LinkTitles_Special.php +++ b/includes/LinkTitles_Special.php @@ -284,11 +284,7 @@ EOF /// Counts the number of pages in a read-access wiki database ($dbr). /// @param $dbr Read-only `Database` object. /// @returns Number of pages in the default namespace (0) of the wiki. -<<<<<<< HEAD:includes/LinkTitles_Special.php - private function countPages( &$dbr ) { -======= private function countPages(&$dbr, $namespacesClause) { ->>>>>>> 085a4032f07ef9200370e7561b5b22b4c05e287c:SpecialLinkTitles.php $res = $dbr->select( 'page', array('pagecount' => "COUNT(page_id)"),