l10n daemon script cd102c92c1 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-02-27 01:54:10 +00:00
..
contents/ui	navigationpanel: Add ability to toggle between gesture only and shown navigation panel modes	2022-02-13 04:23:57 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-02-27 01:54:10 +00:00