diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /tests/phpunit/includes/diff | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'tests/phpunit/includes/diff')
| -rw-r--r-- | tests/phpunit/includes/diff/ArrayDiffFormatterTest.php | 1 | ||||
| -rw-r--r-- | tests/phpunit/includes/diff/DiffOpTest.php | 5 | ||||
| -rw-r--r-- | tests/phpunit/includes/diff/DiffTest.php | 1 | ||||
| -rw-r--r-- | tests/phpunit/includes/diff/DifferenceEngineTest.php | 1 |
4 files changed, 0 insertions, 8 deletions
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 { |