kwin/scripts/videowall
l10n daemon script 2befb1f81c 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"
2016-09-05 09:38:26 +00:00
..
contents add black/whitelist config to videowall 2015-09-29 23:02:41 +02:00
metadata.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-09-05 09:38:26 +00:00