diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-09-28 15:36:21 +0200 |
| commit | 0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9 (patch) | |
| tree | b9cb574a1964f28dda648795010a5be056b80618 /_test/tests/inc/parser/parser.inc.php | |
| parent | 618191d008b98cb421694c541145c863d7b300ce (diff) | |
| parent | da9572711f54d13ce3c5506971154b0bc359723f (diff) | |
| download | rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.gz rpg-0c1b02bead38d5a58032a1c88cf3ca53bbc4a4d9.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly
Conflicts:
inc/lang/hr/searchpage.txt
inc/lang/ko/searchpage.txt
Diffstat (limited to '_test/tests/inc/parser/parser.inc.php')
| -rw-r--r-- | _test/tests/inc/parser/parser.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_test/tests/inc/parser/parser.inc.php b/_test/tests/inc/parser/parser.inc.php index 61f15678b..f1207b119 100644 --- a/_test/tests/inc/parser/parser.inc.php +++ b/_test/tests/inc/parser/parser.inc.php @@ -3,7 +3,7 @@ require_once DOKU_INC . 'inc/parser/parser.php'; require_once DOKU_INC . 'inc/parser/handler.php'; -abstract class TestOfDoku_Parser extends PHPUnit_Framework_TestCase { +abstract class TestOfDoku_Parser extends DokuWikiTest { var $P; var $H; |