e3aa3accdb
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" |
||
|---|---|---|
| .. | ||
| assets.qrc | ||
| CMakeLists.txt | ||
| kdeconnect_presenter.json | ||
| Presenter.qml | ||
| presenterplugin.cpp | ||
| presenterplugin.h | ||
| test.qml | ||