shift-shell/containments
l10n daemon script 006cb7f865 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-02-18 07:54:49 +01:00
..
homescreen SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-18 07:54:49 +01:00
panel SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-18 07:54:49 +01:00
taskpanel SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-18 07:54:49 +01:00
CMakeLists.txt get rid of old homescreen 2019-09-04 18:39:31 +02:00