l10n daemon script 2bbc933297 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-04 01:47:14 +00:00
..
contents/ui	metadata: Fix cmake warnings from incorrectly configured kpackages	2022-09-03 11:34:36 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-04 01:47:14 +00:00