l10n daemon script b525d660bc 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-08-25 01:46:23 +00:00
..
CMakeLists.txt	Use undeprecated install dirs	2022-04-21 00:50:14 +02:00
kdeconnectsendfile.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-08-25 01:46:23 +00:00
Messages.sh	Restore FileItemActionPlugin	2019-04-15 22:36:34 +02:00
sendfileitemaction.cpp	Improve D-Bus implementation on macOS	2022-04-12 05:40:03 +00:00
sendfileitemaction.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00