l10n daemon script d0f4389608 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"		2024-05-04 03:21:24 +00:00
..
CMakeLists.txt	Remove "Open on connected device via KDE Connect"	2023-09-14 06:18:01 +00:00
kdeconnect-dde.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-05-04 03:21:24 +00:00
kdeconnect-thunar.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-05-04 03:21:24 +00:00
kdeconnect.contract	Add contract file	2018-11-02 03:00:39 +01:00
org.kde.kdeconnect.metainfo.xml	GIT_SILENT made messages (after extraction)	2024-04-23 02:44:56 +00:00