f1974db5c9
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
highlightwindow.cpp | ||
highlightwindow.h | ||
main.cpp | ||
metadata.json |