1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-04-04 10:50:32 +03:00
l10n daemon script 953683d1e1 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-11-04 09:04:27 +01:00
..
2019-03-24 18:44:27 +02:00