l10n daemon script d544f70d56 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"		2021-11-25 01:31:28 +00:00
..
airplanemode	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-11-25 01:31:28 +00:00
nightcolor	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-18 01:18:59 +00:00