mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-13 05:38:43 +02:00
fix merge
fix merge
This commit is contained in:
@@ -82,7 +82,7 @@ class InstallationChoicesToModuleConverter
|
||||
return ModuleDiscovery::GetAllModules($aSearchDirs);
|
||||
}
|
||||
|
||||
private function FindInstalledPackageModules(array $aPackageModules, array $aInstallationChoices, array $aInstallationDescription = null): array
|
||||
private function FindInstalledPackageModules(array $aPackageModules, array $aInstallationChoices, ?array $aInstallationDescription = null): array
|
||||
{
|
||||
$aInstalledModules = [];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user