mirror of
https://invent.kde.org/network/falkon.git
synced 2025-10-20 21:09:43 +02:00
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 | ||
| main.css | ||
| metadata.desktop | ||
| rtl.css | ||
| theme.png | ||