Merge

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();
 	}
 }