l10n daemon script a3082de593 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-07-28 01:18:37 +00:00
..
bigscreenplugin.cpp	bigscreen: add comment on how this plugin is used	2020-11-16 12:55:47 +00:00
bigscreenplugin.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
CMakeLists.txt	Clean up unneeded JSON parameter in kcoreaddons_add_plugin	2021-06-28 20:33:52 +02:00
kdeconnect_bigscreen.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-28 01:18:37 +00:00