l10n daemon script cdf5ef113a 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-05-23 11:09:17 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-23 11:09:17 +00:00
CMakeLists.txt