l10n daemon script 2cbb5dfc93 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-09-05 02:46:13 +00:00
..
CMakeLists.txt	Clean up unneeded JSON parameter in kcoreaddons_add_plugin	2021-06-28 20:33:52 +02:00
kdeconnect_remotesystemvolume.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-05 02:46:13 +00:00
remotesystemvolumeplugin.cpp	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
remotesystemvolumeplugin.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00