| commit | f24c523ddfc25896ef85a1b3118358962d5c276f | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 16 Feb 2016 11:14:35 +0000 (16 11:14 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 16 Feb 2016 11:14:35 +0000 (16 11:14 +0000) | ||
| tree | 26959aa27355afed7f97d8845fa780b56a4de571 | treesnapshot (tar.gz zip) |
| parent | 2799f873e627c2e151daefdc7b9a81c976e81a9e | 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 |