From c3a422bdeb4259406a3e9fab2dd0fa9c73dddef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Thu, 20 Jul 2017 17:08:07 +0200 Subject: [PATCH] [ticket/15253] Fix rebase PHPBB3-15253 --- tests/template/template_test_case.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index ae17688190..bcb6f4cde7 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -86,12 +86,7 @@ class phpbb_template_template_test_case extends phpbb_test_case new \phpbb\symfony_request( new phpbb_mock_request() ), -<<<<<<< HEAD - $filesystem, $this->createMock('\phpbb\request\request'), -======= - $this->getMock('\phpbb\request\request'), ->>>>>>> [ticket/15253] Use storage helper methods instead of filesystem methods $phpbb_root_path, $phpEx );