l10n daemon script 373557cd26 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-06-18 08:27:38 +02:00
..
CMakeLists.txt	Fix previous commit	2020-04-16 18:26:00 +02:00
kdeconnect-thunar.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:27:38 +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)	2020-06-18 07:13:50 +02:00
org.kde.kdeconnect_open.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 08:27:38 +02:00