shift-shell/containments
l10n daemon script ee113b8cdc 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-14 01:43:34 +00:00
..
homescreen SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-14 01:43:34 +00:00
panel SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-14 01:43:34 +00:00
taskpanel SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-14 01:43:34 +00:00
CMakeLists.txt REUSE compliance, add check to CI, drop unused components 2021-12-23 16:02:41 +00:00