l10n daemon script b51a575bc6 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-09-09 01:47:56 +00:00
..
contents	mobileshell: Implement base flickable with higher maximum swipe speed	2022-07-08 21:59:55 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-09 01:47:56 +00:00