l10n daemon script 16ccd123dd 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"		2020-06-25 05:50:13 +02:00
..
package	fix warnings	2020-05-15 20:21:24 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-25 05:50:13 +02:00