shift-shell/quicksettings/powermenu/package
l10n daemon script 2a94ef0d96 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-08-20 01:43:57 +00:00
..
contents/ui quicksettings: Add power menu quicksetting 2022-02-11 00:20:47 -05:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2022-08-20 01:43:57 +00:00