l10n daemon script b07173232b 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-10-31 06:11:50 +01:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-31 06:11:50 +01:00
CMakeLists.txt