l10n daemon script c0307bb402 SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"		2022-07-02 02:03:09 +00:00
..
CMakeLists.txt
highlightwindow.cpp	Run clang-tidy with -checks=readability-braces-around-statements fixit	2022-03-28 10:54:11 +00:00
highlightwindow.h	Run clang-format	2022-03-25 13:25:15 +02:00
main.cpp
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-07-02 02:03:09 +00:00