l10n daemon script 53392ea009 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"		2015-04-14 13:53:56 +00:00
..
contents/code
CMakeLists.txt
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-14 13:53:56 +00:00