mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
a8a4981b2c
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" |
||
---|---|---|
cmake | ||
doc | ||
src | ||
.reviewboardrc | ||
AUTHORS | ||
CMakeLists.txt | ||
COPYING | ||
COPYING.DOC | ||
DolphinVcsConfig.cmake.in | ||
org.kde.dolphin.FileManager1.service.in | ||
README |
See http://dolphin.kde.org for information about Dolphin.