1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-13 21:57:40 +03:00
l10n daemon script bcae47a3f9 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-08-26 01:18:26 +00:00
..
2021-05-27 15:01:00 +00:00