mirror of
https://invent.kde.org/network/falkon.git
synced 2025-11-09 21:29:42 +01:00
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 | ||