mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 17:42:10 +01:00
5043a7675d
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" |
||
---|---|---|
.. | ||
breeze-fallback | ||
data | ||
html | ||
icons | ||
breeze-fallback.qrc | ||
data.qrc | ||
html.qrc | ||
icons.qrc |