kwin/effects/frozenapp/package
l10n daemon script cfd296326b 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"
2019-10-23 05:33:32 +02:00
..
contents/code [effects/frozenapp] Put "use strict" at the beginning of the script 2018-11-05 11:27:51 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-23 05:33:32 +02:00