mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 06:13: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" |
||
|---|---|---|
| .. | ||
| ui | ||
| clockconfig_actions.actions | ||
| CMakeLists.txt | ||
| config.h.cmake | ||
| kcm_mobile_time.json | ||
| Messages.sh | ||
| timedated1.xml | ||
| timesettings.cpp | ||
| timesettings.h | ||
| timezonedata.h | ||
| timezonemodel.cpp | ||
| timezonemodel.h | ||
| timezonesi18n.cpp | ||
| timezonesi18n.h | ||