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