1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-09 21:57:37 +03:00
l10n daemon script fbaef27a64 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"
2017-09-10 04:55:31 +02:00
..