mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 22:59:45 -09:00
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" |
||
|---|---|---|
| .. | ||
| desktoptoolbox | ||
| paneltoolbox | ||
| CMakeLists.txt | ||
| plasma-toolbox-paneltoolbox.desktop | ||