mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-23 22:03:54 +03:00
6c2b5f4971
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"