shift-shell/quicksettings/record/package
l10n daemon script 62a2633f72 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-08-28 01:30:06 +00:00
..
contents/ui Remove trailing whitespace 2024-07-26 23:47:44 -04:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2024-08-28 01:30:06 +00:00