l10n daemon script 982d7cc438 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"		2018-12-07 05:29:42 +01:00
..
package
CMakeLists.txt