l10n daemon script ef60c8e53c 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-10-29 01:52:40 +00:00
..
contents	Make Toplevel::isClient() return true for internal and wayland windows	2021-05-25 19:06:17 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-10-29 01:52:40 +00:00