1e1bee501f
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 | ||
org.kde.kpmcore.scan.actions | ||
scan.cpp | ||
scan.h |