l10n daemon script c61a67f86a 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"		2020-02-04 06:10:13 +01: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-11-30 05:34:44 +01: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)	2020-02-04 03:16:17 +01:00
org.kde.kdeconnect_open.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-04 06:10:13 +01:00