diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 18:11:38 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-07 18:11:38 -0600 |
| commit | 92ec214537d041076187cc013d08175e8cff3fe8 (patch) | |
| tree | 24ccc13c2205faf1a2ba98ae159078ddbe1d90f4 /tests/class_loader/class_loader_test.php | |
| parent | b25efd744db56f7565453caccf26630404db07c7 (diff) | |
| parent | 108a6c35a6d718166a8bfd17042cac5f2ccc6d20 (diff) | |
| download | forums-92ec214537d041076187cc013d08175e8cff3fe8.tar forums-92ec214537d041076187cc013d08175e8cff3fe8.tar.gz forums-92ec214537d041076187cc013d08175e8cff3fe8.tar.bz2 forums-92ec214537d041076187cc013d08175e8cff3fe8.tar.xz forums-92ec214537d041076187cc013d08175e8cff3fe8.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/8323
Conflicts:
phpBB/viewtopic.php
Diffstat (limited to 'tests/class_loader/class_loader_test.php')
| -rw-r--r-- | tests/class_loader/class_loader_test.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/class_loader/class_loader_test.php b/tests/class_loader/class_loader_test.php index 80f0b38095..76af4dde37 100644 --- a/tests/class_loader/class_loader_test.php +++ b/tests/class_loader/class_loader_test.php @@ -7,8 +7,6 @@ * */ -require_once dirname(__FILE__) . '/../mock/cache.php'; - class phpbb_class_loader_test extends PHPUnit_Framework_TestCase { public function setUp() |