Commits
Martins Talbergs authored b4570a864b1
A.F....... [ZBX-12943] resolved conflicts Conflicting files were: - tests/api_json/CHost.php - include/classes/api/services/CHost.php - include/classes/export/CConfigurationExportBuilder.php - include/classes/import/converters/C42ImportConverter.php - include/classes/import/validators/C44XmlValidator.php - tests/unit/include/classes/import/CImportDataAdapterTest.php