mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36:34 +01:00
60fc262bc0
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" |
||
---|---|---|
.. | ||
hellopython | ||
helloqml | ||
middleclickloader | ||
runaction | ||
CMakeLists.txt | ||
i18n.py |