mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
395cb5d2f5
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" |
||
---|---|---|
bin | ||
flatpak | ||
git_hooks | ||
linux | ||
mac | ||
other | ||
scripts | ||
src | ||
tests | ||
translations | ||
windows | ||
.gitignore | ||
BUILDING.md | ||
CHANGELOG | ||
CMakeLists.txt | ||
COPYRIGHT | ||
falkon.pro | ||
LICENSE | ||
README.md |