l10n daemon script 1dfabeac2a 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-01-27 08:55:30 +01:00
..
package/ui	publish Abilities qml library	2020-04-20 12:41:20 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-27 08:55:30 +01:00