l10n daemon script 3f43a2ec5e 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-08-28 02:28:22 +00:00
..
contents	Allow maximising panel conditionally.	2023-10-29 22:28:04 +00:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-08-28 02:28:22 +00:00