| commit | 7b47ba27cf167dc856760911beee949eb7aab1b8 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 7 Apr 2016 10:09:45 +0000 (7 10:09 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 7 Apr 2016 10:09:45 +0000 (7 10:09 +0000) | ||
| tree | 7005a215edbca93085f2f2ab1602c26befba172f | treesnapshot (tar.gz zip) |
| parent | 74906ea6f7c68f37125cb6e8b005c36a76c8eafa | 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_general.desktop | diffblobblamehistory | |
| akregator/configuration/akregator_config_webengineurlinterceptor.desktop | diffblobblamehistory |