l10n daemon script bee030fc67 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"		2022-05-15 01:52:52 +00:00
..
CMakeLists.txt	Use undeprecated install dirs	2022-04-21 00:50:14 +02:00
kdeconnect-dde.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:05:33 +00:00
kdeconnect-thunar.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-20 02:05:33 +00:00
kdeconnect.contract	Add contract file	2018-11-02 03:00:39 +01:00
org.kde.kdeconnect.metainfo.xml	Add App Store link	2022-05-09 08:58:28 +00:00
org.kde.kdeconnect_open.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-15 01:52:52 +00:00