mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-16 22:04:08 +03:00
064b1178e6
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"