l10n daemon script 6858dcdeb8 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"		2024-06-28 02:26:30 +00:00
..
package	rename "size" to thickness for some properties	2022-06-11 09:21:53 +03:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-06-28 02:26:30 +00:00