plasma-framework/examples/applets/bugreport
l10n daemon script 5265842028 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"
2015-03-14 10:19:38 +00:00
..
contents/ui don'rthave commented out imports in examples 2014-03-18 13:47:17 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-03-14 10:19:38 +00:00