| commit | e92309c802d4ad0dca072811c9162eea460bc18d | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 20 Sep 2016 12:50:09 +0000 (20 12:50 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 20 Sep 2016 12:50:09 +0000 (20 12:50 +0000) | ||
| tree | d43dd8836d7c9d3b37cea94a5dc8f3ffd0ce4480 | treesnapshot (tar.gz zip) |
| parent | 86597aadc9a8fb0d883b5513ae1f269e31d1962b | commitdiff |
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"
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"
| akonadiconsole/src/org.kde.akonadiconsole.desktop | diffblobblamehistory | |
| korganizer/src/kcmconfigs/korganizer_configplugins.desktop | diffblobblamehistory |