Commit graph

3 commits

Author SHA1 Message Date
l10n daemon script
518b94e018 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"
2024-06-28 01:25:09 +00:00
l10n daemon script
fe3a39a5a9 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"
2024-06-27 01:19:29 +00:00
Devin Lin
b4f7ca1139 layout-templates: Move default panel configuration to layout template package 2024-06-26 00:57:56 +00:00