1d6de6a3a9
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" |
||
---|---|---|
.. | ||
data | ||
CMakeLists.txt | ||
main.cpp | ||
metadata.json | ||
startupfeedback.cpp | ||
startupfeedback.h |