From 3683dfb0a7e2ab51093a0c1151f50159b6340847 Mon Sep 17 00:00:00 2001 From: Yves Hoppe Date: Sun, 1 Nov 2015 10:22:31 +0100 Subject: [PATCH] Merge --- tests/acceptance/install/InstallWeblinksCest.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/acceptance/install/InstallWeblinksCest.php b/tests/acceptance/install/InstallWeblinksCest.php index e680d70..dbd59c9 100644 --- a/tests/acceptance/install/InstallWeblinksCest.php +++ b/tests/acceptance/install/InstallWeblinksCest.php @@ -26,15 +26,10 @@ class InstallWeblinksCest { $I->doAdministratorLogin(); $I->comment('get Weblinks repository folder from acceptance.suite.yml (see _support/AcceptanceHelper.php)'); -<<<<<<< HEAD // URL where the package file to install is located (mostly the same as joomla-cms) $url = $I->getConfiguration('url'); $I->installExtensionFromUrl($url . "/pkg-weblinks-current.zip"); -======= - $path = $I->getConfiguration('repo_folder'); - $I->installExtensionFromFolder(rtrim($path, "/") . '/src/com_weblinks/'); ->>>>>>> master $I->doAdministratorLogout(); } } \ No newline at end of file