shift-shell/look-and-feel
l10n daemon script eb0ffaf3be 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"
2021-05-16 01:24:32 +00:00
..
contents lockscreen: do not show percentage for signal strength 2021-05-14 15:01:01 +05:30
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-05-16 01:24:32 +00:00