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

[ticket/14484] Remove invalid code caused by merge conflict

Browse source 
PHPBB3-14484
This commit is contained in:
Marc Alexander 2016-09-18 21:52:11 +02:00
parent 229472cb07
commit 6242698a84
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/test_framework/phpbb_ui_test_case.php
View file

@ -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()); $this->assertContains($this->lang('ADMIN_PANEL'), $this->find_element('cssSelector', 'h1')->getText());
$cookies = self::$webDriver->manage()->getCookies(); $cookies = self::$webDriver->manage()->getCookies();
copy($config_file, $config_file_test);
self::$install_success = true;
} }
public function install_ext($extension) public function install_ext($extension)