mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 14:49:44 -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" |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| device_automounter_kcm.json | ||
| DeviceAutomounterKCM.cpp | ||
| DeviceAutomounterKCM.h | ||
| DeviceAutomounterKCM.ui | ||
| DeviceModel.cpp | ||
| DeviceModel.h | ||
| LayoutSettings.kcfg | ||
| LayoutSettings.kcfgc | ||
| Messages.sh | ||