shift-shell/containments
l10n daemon script f1bce20b3e 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-06-01 01:58:30 +00:00
..
homescreens SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-01 01:58:30 +00:00
panel SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-01 01:58:30 +00:00
taskpanel SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-01 01:58:30 +00:00
CMakeLists.txt homescreen: Move into folder 2022-05-17 23:19:11 -04:00