l10n daemon script 8e1485b4c8 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-04-06 06:06:15 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-04-06 06:06:15 +02:00
CMakeLists.txt