shift-shell/quicksettings
l10n daemon script 1e96ec0f3f 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-09-18 01:15:29 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-18 01:15:29 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2021-09-01 01:21:40 +00:00