mirror of
https://github.com/KDE/latte-dock.git
synced 2025-02-02 05:47:18 +03:00
55caf75ab4
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"