l10n daemon script e88082caf0 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"		2023-01-05 02:01:35 +00:00
..
folio	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-05 02:01:35 +00:00
halcyon	Remove duplicate headers between cpp/h files	2022-12-19 13:29:20 +01:00
CMakeLists.txt	homescreens/folio: Rename from default	2022-09-11 20:01:23 -04:00