diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 10:33:45 -0500 |
| commit | 16aeaed7bda590268c621216a42818ec64c1f37b (patch) | |
| tree | 5aaae3387ef3b13a5edc8b1d9b5bf8a634f24b9e /tests | |
| parent | a7edbf9258253dd694857af80273f6cddfe91274 (diff) | |
| parent | f4b7cbd9766fff3e4232c5514da18c8fc3ff102b (diff) | |
| download | forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.gz forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.bz2 forums-16aeaed7bda590268c621216a42818ec64c1f37b.tar.xz forums-16aeaed7bda590268c621216a42818ec64c1f37b.zip | |
Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11662:
[ticket/11662] Typos: occured -> occurred
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/template/template_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/template/template_test.php b/tests/template/template_test.php index fd68124c89..94ec2ab8a7 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -32,7 +32,7 @@ class phpbb_template_template_test extends phpbb_test_case } catch (Exception $exception) { - // reset the error level even when an error occured + // reset the error level even when an error occurred // PHPUnit turns trigger_error into exceptions as well error_reporting($error_level); ob_end_clean(); |