
kdevelop
A cross-platform IDE for C, C++, Python, QML/JavaScript and PHP
Forked from KDE / kdevelop
-
Script Kiddy authored
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"
6e1a5174