mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 22:33:08 +00: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" |
||
|---|---|---|
| .. | ||
| package/contents/ui | ||
| CMakeLists.txt | ||
| gsettingsitem.cpp | ||
| gsettingsitem.h | ||
| kcm_mobile_onscreenkeyboard.json | ||
| languagemodel.cpp | ||
| languagemodel.h | ||
| Messages.sh | ||
| virtualkeyboard.cpp | ||
| virtualkeyboard.h | ||