mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
d04e0091a7
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" |
||
---|---|---|
autotests | ||
linux | ||
mac | ||
src | ||
tests | ||
themes | ||
windows | ||
.arcconfig | ||
.gitignore | ||
CHANGELOG | ||
CMakeLists.txt | ||
config.h.cmake | ||
COPYING | ||
README.md |