kwin/packageplugins/aurorae
l10n daemon script 2e371f9634 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"
2017-10-29 03:39:13 +01:00
..
aurorae.cpp
aurorae.h
CMakeLists.txt
kwin-packagestructure-aurorae.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-10-29 03:39:13 +01:00