mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-13 10:32:11 +01:00
f322c4ed94
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" |
||
---|---|---|
.. | ||
extensions.svg | ||
helloqml.qml | ||
Messages.sh | ||
metadata.desktop | ||
script.js |