| commit | fffb6560f20a7a315eac3a682c313c87b867e63d | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 19 Jan 2016 13:07:59 +0000 (19 13:07 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 19 Jan 2016 13:07:59 +0000 (19 13:07 +0000) | ||
| tree | 1b4391300f3e61e424e348692235d16bb91b5633 | treesnapshot (tar.gz zip) |
| parent | 71a87914ba5120275c9fdd3d6e52c2e86568bb52 | 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_adblock.desktop | diffblobblamehistory |