shift-shell/quicksettings/screenrotation/package
l10n daemon script 9131752fd3 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-08 01:20:22 +00:00
..
contents/ui quicksettings/screenrotation: Fix it by porting to changed API 2023-11-05 15:09:33 -08:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-08 01:20:22 +00:00