22da928d2b
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
drm | ||
fbdev | ||
hwcomposer | ||
virtual | ||
wayland | ||
x11 | ||
CMakeLists.txt |