l10n daemon script 8e13435ccb 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-03-29 02:17:10 +00:00
..
homescreen	homescreen: Ensure signal is listened to for closing startup feedback on error	2022-03-20 14:24:44 -04:00
panel	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-29 02:17:10 +00:00
taskpanel	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-29 02:17:10 +00:00
CMakeLists.txt	REUSE compliance, add check to CI, drop unused components	2021-12-23 16:02:41 +00:00