l10n daemon script ee60653640 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-05-08 05:51:51 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-08 05:51:51 +02:00
CMakeLists.txt