11cca79ecf
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
screens_xrandr.cpp | ||
screens_xrandr.h | ||
x11.json | ||
x11_platform.cpp | ||
x11_platform.h |