l10n daemon script db86c14293 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-06-25 02:00:12 +00:00
..
contents	lockscreen: Improve physical keyboard input	2022-06-23 23:35:54 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-06-25 02:00:12 +00:00