l10n daemon script 0db88c3ea6 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"		2021-12-15 01:55:28 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:55:28 +00:00
CMakeLists.txt