1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 02:50:22 +03:00
l10n daemon script 8f30e86ab5 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"
2018-04-19 07:07:18 +02:00
..
2017-07-28 03:09:01 +03:00