From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 tests/phpunit/includes/diff/ArrayDiffFormatterTest.php | 1 -
 tests/phpunit/includes/diff/DiffOpTest.php             | 5 -----
 tests/phpunit/includes/diff/DiffTest.php               | 1 -
 tests/phpunit/includes/diff/DifferenceEngineTest.php   | 1 -
 4 files changed, 8 deletions(-)

(limited to 'tests/phpunit/includes/diff')

diff --git a/tests/phpunit/includes/diff/ArrayDiffFormatterTest.php b/tests/phpunit/includes/diff/ArrayDiffFormatterTest.php
index 188ad3fd..3bea9b31 100644
--- a/tests/phpunit/includes/diff/ArrayDiffFormatterTest.php
+++ b/tests/phpunit/includes/diff/ArrayDiffFormatterTest.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @licence GNU GPL v2+
  * @author Adam Shorland
  *
  * @group Diff
diff --git a/tests/phpunit/includes/diff/DiffOpTest.php b/tests/phpunit/includes/diff/DiffOpTest.php
index d89b89fe..cbe05732 100644
--- a/tests/phpunit/includes/diff/DiffOpTest.php
+++ b/tests/phpunit/includes/diff/DiffOpTest.php
@@ -1,10 +1,5 @@
 <?php
-
-//Load our FakeDiffOp
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'FakeDiffOp.php';
-
 /**
- * @licence GNU GPL v2+
  * @author Adam Shorland
  *
  * @group Diff
diff --git a/tests/phpunit/includes/diff/DiffTest.php b/tests/phpunit/includes/diff/DiffTest.php
index 1911c82a..e0d79157 100644
--- a/tests/phpunit/includes/diff/DiffTest.php
+++ b/tests/phpunit/includes/diff/DiffTest.php
@@ -1,7 +1,6 @@
 <?php
 
 /**
- * @licence GNU GPL v2+
  * @author Adam Shorland
  *
  * @group Diff
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index 5474b963..0f599af1 100644
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -8,7 +8,6 @@
  * @group Database
  * @group Diff
  *
- * @licence GNU GPL v2+
  * @author Katie Filbert < aude.wiki@gmail.com >
  */
 class DifferenceEngineTest extends MediaWikiTestCase {
-- 
cgit v1.2.3-54-g00ecf