c4c6ca18ba
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" |
||
---|---|---|
.. | ||
backend | ||
core | ||
fs | ||
gui | ||
jobs | ||
ops | ||
plugins | ||
util | ||
CMakeLists.txt | ||
Messages.sh |