| commit | 71c947fb951722cb5e53129697c2db4788b2c75c | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 25 Apr 2016 10:25:00 +0000 (25 10:25 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 25 Apr 2016 10:25:00 +0000 (25 10:25 +0000) | ||
| tree | e7e1de0f343b92c704b110abd29b25c9d5fc718c | treesnapshot (tar.gz zip) |
| parent | 954c56550a1551fd66b0eed95baa18b28ca3c405 | 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 |