1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-03 20:58:25 +03:00
l10n daemon script 348b617b49 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-03-31 06:35:48 +02:00
..
2019-03-24 18:44:27 +02:00