shift-shell/quicksettings
l10n daemon script 0898ee2e80 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-02-09 01:48:59 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-09 01:48:59 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-09 01:48:59 +00:00
CMakeLists.txt quicksettings/nightcolor: Fix night color 2022-01-04 12:12:46 -05:00