Text conflict in include/server/mir/graphics/platform.h
Text conflict in src/server/graphics/android/android_platform.h
Text conflict in src/server/graphics/gbm/gbm_platform.cpp
Text conflict in src/server/graphics/gbm/gbm_platform.h
Text conflict in tests/integration-tests/graphics/gbm/test_buffer_integration.cpp
Text conflict in tests/integration-tests/test_display_info.cpp
Text conflict in tests/integration-tests/test_drm_auth_magic.cpp
Text conflict in tests/integration-tests/test_surfaceloop.cpp
Text conflict in tests/mir_test_framework/testing_server_options.cpp
Text conflict in tests/unit-tests/frontend/test_session_mediator.cpp
Text conflict in tests/unit-tests/frontend/test_session_mediator_android.cpp
Text conflict in tests/unit-tests/frontend/test_session_mediator_gbm.cpp
Text conflict in tests/unit-tests/graphics/gbm/mock_drm.cpp
Text conflict in tests/unit-tests/graphics/gbm/mock_drm.h
14 conflicts encountered.
Text conflict in include/ server/ mir/graphics/ platform. h graphics/ android/ android_ platform. h graphics/ gbm/gbm_ platform. cpp graphics/ gbm/gbm_ platform. h on-tests/ graphics/ gbm/test_ buffer_ integration. cpp on-tests/ test_display_ info.cpp on-tests/ test_drm_ auth_magic. cpp on-tests/ test_surfaceloo p.cpp test_framework/ testing_ server_ options. cpp tests/frontend/ test_session_ mediator. cpp tests/frontend/ test_session_ mediator_ android. cpp tests/frontend/ test_session_ mediator_ gbm.cpp tests/graphics/ gbm/mock_ drm.cpp tests/graphics/ gbm/mock_ drm.h
Text conflict in src/server/
Text conflict in src/server/
Text conflict in src/server/
Text conflict in tests/integrati
Text conflict in tests/integrati
Text conflict in tests/integrati
Text conflict in tests/integrati
Text conflict in tests/mir_
Text conflict in tests/unit-
Text conflict in tests/unit-
Text conflict in tests/unit-
Text conflict in tests/unit-
Text conflict in tests/unit-
14 conflicts encountered.