1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-25 06:50:33 +03:00
l10n daemon script b015228ecd 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-03-31 02:16:10 +00:00
..
2019-03-24 18:44:27 +02:00