plasma-framework/examples/applets/testcomponents
l10n daemon script e80ebab9db 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"
2018-02-25 05:27:39 +01:00
..
contents qtextracomponents->kquickcontrolsaddons 2014-03-25 17:10:25 +01:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:27:39 +01:00