l10n daemon script 872e213010 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-03-31 01:41:19 +00:00
..
CMakeLists.txt	appstream: Address some problems	2022-02-04 14:00:04 +00: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	GIT_SILENT made messages (after extraction)	2022-03-31 00:43:11 +00:00
org.kde.kdeconnect_open.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-31 01:41:19 +00:00