l10n daemon script 8e13435ccb 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-03-29 02:17:10 +00:00
..
contents/ui	libmobileshell: Move non-API components to declarative and use PW API for keyboard	2022-03-18 22:59:42 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-29 02:17:10 +00:00