7b93571787
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 | ||
dummybackend.cpp | ||
dummybackend.h | ||
dummydevice.cpp | ||
dummydevice.h | ||
dummypartitiontable.cpp | ||
dummypartitiontable.h | ||
pmdummybackendplugin.json |