mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 08:21:22 +00:00
e3ea9b558e
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" |
||
---|---|---|
.. | ||
fileviewversioncontrolplugin.desktop | ||
kversioncontrolplugin.cpp | ||
kversioncontrolplugin.h | ||
updateitemstatesthread.cpp | ||
updateitemstatesthread.h | ||
versioncontrolobserver.cpp | ||
versioncontrolobserver.h |