diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2015-07-09 02:07:48 +0200 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2015-07-09 02:07:48 +0200 |
| commit | 46e6a4e61fa6a38540aa87f37200f3007f10f13f (patch) | |
| tree | 3d2d81607711990de2fc22e08dc03ddbd363d13e | |
| parent | 01097a24b50a6ffa0662740bbf418399ed5623f2 (diff) | |
| parent | 80f91da9b9ab7f4c2d66ba5632802a3a5dfa489f (diff) | |
| download | forums-46e6a4e61fa6a38540aa87f37200f3007f10f13f.tar forums-46e6a4e61fa6a38540aa87f37200f3007f10f13f.tar.gz forums-46e6a4e61fa6a38540aa87f37200f3007f10f13f.tar.bz2 forums-46e6a4e61fa6a38540aa87f37200f3007f10f13f.tar.xz forums-46e6a4e61fa6a38540aa87f37200f3007f10f13f.zip | |
Merge pull request #3752 from VSEphpbb/ticket/13995
[ticket/13995] Fix errors in tests from merge conflict
| -rw-r--r-- | tests/template/template_includecss_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php index ea851e3568..ac62e820ae 100644 --- a/tests/template/template_includecss_test.php +++ b/tests/template/template_includecss_test.php @@ -103,11 +103,11 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te ), array( 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('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" />', ), ); } |