# Conflicts: # include/f1x/openauto/autoapp/Configuration/Configuration.hpp # include/f1x/openauto/autoapp/Configuration/IConfiguration.hpp # src/autoapp/Configuration/Configuration.cpp # src/autoapp/Service/AndroidAutoEntity.cpp # src/autoapp/Service/SensorService.cpp # src/autoapp/Service/ServiceFactory.cpp # src/autoapp/UI/SettingsWindow.cpp