l10n daemon script f94e5bc843 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-05-19 01:42:43 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-19 01:42:43 +00:00
CMakeLists.txt	Remove configure_file method calls for KPackage metadata.desktop files	2022-05-15 09:14:46 +00:00