l10n daemon script f3b1522bf6 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"		2019-08-20 05:05:24 +02:00
..
contents	loader.qml isn't necessary anymore	2019-08-14 13:31:44 +05:30
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-20 05:05:24 +02:00