l10n daemon script 6526efe72a 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-12-03 05:49:05 +01:00
..
contents/code	[effects/windowaperture] Use strict mode for the whole script	2018-11-08 14:32:47 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-03 05:49:05 +01:00