l10n daemon script bbad15f661 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"		2017-08-10 04:56:42 +02:00
..
contents
CMakeLists.txt
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-10 04:56:42 +02:00