mirror of
https://github.com/KDE/latte-dock.git
synced 2025-02-01 17:47:25 +03:00
237ec8c4bf
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"