Commit graph

5 commits

Author SHA1 Message Date
l10n daemon script
af8ef4f9f8 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-13 02:37:20 +00:00
l10n daemon script
99614ecbd7 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-12 01:45:23 +00:00
l10n daemon script
23b4ad1f0e 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-11 01:42:04 +00:00
l10n daemon script
1445b44ce9 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-10 01:42:25 +00:00
Devin Lin
a173cf9b9d homescreens/halcyon: Add new homescreen 2022-06-08 18:09:35 -04:00