1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-01 17:47:25 +03:00
l10n daemon script 237ec8c4bf 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"
2023-11-04 11:56:25 +00:00
..