-
Andreas Rauschert authored
Conflicting files: MantleAPI/include/MantleAPI/Execution/i_environment.h MantleAPI/include/MantleAPI/Map/i_lane_location_query_service.h MantleAPI/include/MantleAPI/Map/map_details.h MantleAPI/include/MantleAPI/Traffic/control_strategy.h MantleAPI/include/MantleAPI/Traffic/entity_helper.h MantleAPI/include/MantleAPI/Traffic/entity_properties.h MantleAPI/include/MantleAPI/Traffic/i_entity.h MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h MantleAPI/test/MantleAPI/Test/test_utils.h MantleAPI/test/interface_test.cpp
f84797ea