4b1b1b9b14
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 | ||
kdeconnectd.cpp | ||
Messages.sh | ||
org.kde.kdeconnect.daemon.desktop.cmake | ||
org.kde.kdeconnect.service.in |