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"
Alligator
Alligator is an RSS/Atom feed reader, currently under development.
Languages
C++
63.8%
QML
33.2%
CMake
2.7%
C
0.3%