-
Script Kiddy authoredIn case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
efc5fcbb
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| db | ||
| models | ||
| providers | ||
| syncing | ||
| utils | ||
| views | ||
| widgets | ||
| CMakeLists.txt | ||
| buho.cpp | ||
| buho.h | ||
| linker.cpp | ||
| linker.h | ||
| main.cpp | ||
| main.qml | ||
| org.kde.buho.desktop | ||
| qml.qrc | ||
| utils.js |