l10n daemon script daa164bea1 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-08-28 01:25:08 +00:00
..
CMakeLists.txt
kdeconnectsendfile.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-08-28 01:25:08 +00:00
Messages.sh
sendfileitemaction.cpp
sendfileitemaction.h