l10n daemon script bd6ae904b9 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"		2022-04-01 02:01:29 +00:00
..
package	[indicators api] - new background corner margin	2021-10-03 09:23:50 +03:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-01 02:01:29 +00:00