You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 004a9aa6ea 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"
7 years ago
..
CMakeLists.txt
aurorae.cpp
aurorae.h
kwin-packagestructure-aurorae.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 7 years ago