shift-shell/containments/homescreens
l10n daemon script 9131752fd3 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"
2024-06-08 01:20:22 +00:00
..
folio SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-08 01:20:22 +00:00
halcyon SVN_SILENT made messages (.desktop file) - always resolve ours 2024-06-08 01:20:22 +00:00
CMakeLists.txt homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00