l10n daemon script b11d141169 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"		2021-01-16 10:59:59 +01:00
..
CMakeLists.txt	Add entry into Deepin file manager context menu	2020-04-22 18:31:25 +02:00
kdeconnect-dde.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-16 10:59:59 +01:00
kdeconnect-thunar.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-16 10:59:59 +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)	2021-01-16 09:12:03 +01:00
org.kde.kdeconnect_open.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-16 10:59:59 +01:00