mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 09:42:10 +02:00
bd5e46b3a2
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" |
||
---|---|---|
.. | ||
__init__.py | ||
mcl_handler.py | ||
mcl_loadmode.py | ||
mcl_settings.py | ||
mcl_settings.ui | ||
Messages.sh | ||
metadata.desktop |