mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +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" |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| config.h | ||
| kded_plasma_mobile_start.json | ||
| settings.cpp | ||
| settings.h | ||
| startdaemon.cpp | ||
| startdaemon.h | ||
| utils.h | ||