mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-15 11:32:11 +01:00
524697d139
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" |
||
---|---|---|
.. | ||
data | ||
CMakeLists.txt | ||
Messages.sh | ||
metadata.desktop | ||
PIM_handler.cpp | ||
PIM_handler.h | ||
PIM_plugin.cpp | ||
PIM_plugin.h | ||
PIM_res.qrc | ||
PIM_settings.cpp | ||
PIM_settings.h | ||
PIM_settings.ui | ||
test.html |