shift-shell/quicksettings
l10n daemon script d7b7290451 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-10-19 01:17:49 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2021-10-19 01:17:49 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2021-10-18 01:18:59 +00:00