61b2e607b4
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 | ||
dialog.ui | ||
kdeconnect-handler.cpp | ||
Messages.sh | ||
org.kde.kdeconnect.handler.desktop |