30b516eceb
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" |
||
|---|---|---|
| .. | ||
| package | ||
| CMakeLists.txt | ||
| Messages.sh | ||
| animationsmodel.cpp | ||
| animationsmodel.h | ||
| desktopsmodel.cpp | ||
| desktopsmodel.h | ||
| kcm_kwin_virtualdesktops.desktop | ||
| virtualdesktops.cpp | ||
| virtualdesktops.h | ||
| virtualdesktopssettings.kcfg | ||
| virtualdesktopssettings.kcfgc | ||