| commit | d0d386ca6217bfbba012955549ef55d9e0b77718 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 13 Jul 2016 10:19:09 +0000 (13 10:19 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 13 Jul 2016 10:19:09 +0000 (13 10:19 +0000) | ||
| tree | 98ef7f3efd4c33c4a2af8c42e20b5772781e0416 | treesnapshot (tar.gz zip) |
| parent | 22a4abec8e4713b32eccfdbb1622621cec6ce9f9 | 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"
| akregator/configuration/akregator_config_webengineurlinterceptor.desktop | diffblobblamehistory | |
| kmail/src/data/org.kde.kmail.desktop | diffblobblamehistory |