mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
1f1978751f
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 | ||
button.py | ||
hellopython.py | ||
Messages.sh | ||
metadata.desktop | ||
sidebar.py |