mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-15 19:42:10 +01:00
42e0c865b2
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 | ||
Messages.sh | ||
metadata.desktop | ||
testplugin_sidebar.cpp | ||
testplugin_sidebar.h | ||
testplugin.cpp | ||
testplugin.h | ||
testplugin.qrc |