l10n daemon script 622708aa63 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"		2024-08-28 03:19:52 +00:00
..
contents/ui	plasmoid: Port to pragma ComponentBehavior: Bound	2024-07-12 11:44:13 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-08-28 03:19:52 +00:00