kdeconnect-kde/data
l10n daemon script 1141271bc2 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"
2019-07-22 05:05:01 +02:00
..
CMakeLists.txt Install desktop file to open files on remote device 2019-07-19 21:22:29 +00:00
kdeconnect-thunar.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-27 05:13:07 +02:00
kdeconnect.contract Add contract file 2018-11-02 03:00:39 +01:00
org.kde.kdeconnect.kcm.appdata.xml GIT_SILENT made messages (after extraction) 2019-07-14 02:44:43 +02:00
org.kde.kdeconnect_open.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-22 05:05:01 +02:00