6baa2ff976
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 | ||
kdeconnect-thunar.desktop | ||
kdeconnect.contract | ||
org.kde.kdeconnect.kcm.appdata.xml | ||
org.kde.kdeconnect_open.desktop |