l10n daemon script b37b5fc8a3 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-04-27 02:29:47 +00:00
..
contents	volumeosd: Extract out singleton so that it's only loaded once in plasmashell	2023-03-19 21:10:49 -07:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-04-27 02:29:47 +00:00