1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-14 22:50:11 +03:00
l10n daemon script 63dd1831d5 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-07-08 02:20:20 +00:00
..