aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-18 21:52:11 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-09-18 21:52:11 +0200
commit6242698a84dfc00bc5a09705eeed2db1a539996c (patch)
tree50e508148f69323f56aed30376d5d883883eb48c
parent229472cb071ba6c1cba448652ac0e4ddd8ea9be0 (diff)
downloadforums-6242698a84dfc00bc5a09705eeed2db1a539996c.tar
forums-6242698a84dfc00bc5a09705eeed2db1a539996c.tar.gz
forums-6242698a84dfc00bc5a09705eeed2db1a539996c.tar.bz2
forums-6242698a84dfc00bc5a09705eeed2db1a539996c.tar.xz
forums-6242698a84dfc00bc5a09705eeed2db1a539996c.zip
[ticket/14484] Remove invalid code caused by merge conflict
PHPBB3-14484
-rw-r--r--tests/test_framework/phpbb_ui_test_case.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index bc761aff69..1d6dda0ba6 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -340,10 +340,6 @@ class phpbb_ui_test_case extends phpbb_test_case
$this->assertContains($this->lang('ADMIN_PANEL'), $this->find_element('cssSelector', 'h1')->getText());
$cookies = self::$webDriver->manage()->getCookies();
-
- copy($config_file, $config_file_test);
-
- self::$install_success = true;
}
public function install_ext($extension)