l10n daemon script 3ee29af814 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"		2023-01-01 02:14:13 +00:00
..
CMakeLists.txt
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-01 02:14:13 +00:00
photoplugin.cpp
photoplugin.h