1. Conflicts: Text conflict in src/server/shell/surface.cpp Text conflict in tests/unit-tests/surfaces/test_surface.cpp
2. Please resolve this inconsistency: "swapinterval" and "swap_interval".
« Back to merge proposal
1. Conflicts: shell/surface. cpp tests/surfaces/ test_surface. cpp
Text conflict in src/server/
Text conflict in tests/unit-
2. Please resolve this inconsistency: "swapinterval" and "swap_interval".