c63567b524
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 | ||
libpartedbackend.cpp | ||
libpartedbackend.h | ||
libparteddevice.cpp | ||
libparteddevice.h | ||
libpartedpartition.cpp | ||
libpartedpartition.h | ||
libpartedpartitiontable.cpp | ||
libpartedpartitiontable.h | ||
pedflags.h | ||
pmlibpartedbackendplugin.desktop |