l10n daemon script 5a9802ae5f 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-07-17 01:46:57 +00:00
..
contents/ui	homescreens/halcyon: Port folder app list to QAbstractListModel	2022-07-12 22:28:40 -04:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-17 01:46:57 +00:00