makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3752 from VSEphpbb/ticket/13995

Browse source 
[ticket/13995] Fix errors in tests from merge conflict
This commit is contained in:
Máté Bartus 2015-07-09 02:07:48 +02:00
commit 46e6a4e61f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/template/template_includecss_test.php
View file

@ -103,11 +103,11 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
), ),
array( array(
array('TEST' => 3), array('TEST' => 3),
'<link href="tests/template//ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', '<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
), ),
array( array(
array('TEST' => 4), array('TEST' => 4),
'<link href=tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />', '<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen" />',
), ),
); );
} }