mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 12:46:35 +01:00
7beef65ae1
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" |
||
---|---|---|
.. | ||
images | ||
license.txt | ||
linux.css | ||
main.css | ||
metadata.desktop | ||
rtl.css | ||
theme.png | ||
windows.css |