a4379583b3
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 | ||
pmsfdiskbackendplugin.json | ||
sfdiskbackend.cpp | ||
sfdiskbackend.h | ||
sfdiskdevice.cpp | ||
sfdiskdevice.h | ||
sfdiskpartitiontable.cpp | ||
sfdiskpartitiontable.h |