kdeconnect-kde/data
l10n daemon script 38fed324bf SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2018-11-21 05:40:27 +01:00
..
CMakeLists.txt Thunar integration 2018-11-02 03:21:03 +01:00
kdeconnect-thunar.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-11-21 05:40:27 +01:00
kdeconnect.contract Add contract file 2018-11-02 03:00:39 +01:00
org.kde.kdeconnect.kcm.appdata.xml Add contract file 2018-11-02 03:00:39 +01:00