283211b4eb
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" |
||
---|---|---|
.. | ||
qml | ||
rpm | ||
CMakeLists.txt | ||
kdeconnect-sfos.cpp | ||
kdeconnect-sfos.desktop | ||
kdeconnectd.desktop.cmake | ||
org.kde.kdeconnect.service.in | ||
sailfishdaemon.cpp |