| commit | 1a058887cebae7277980afbc95ac6989c4e6d05f | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 13 Jan 2016 10:38:50 +0000 (13 10:38 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 13 Jan 2016 10:38:50 +0000 (13 10:38 +0000) | ||
| tree | 075b6b9562266d667772f8af546a3029e4fb0689 | treesnapshot (tar.gz zip) |
| parent | 743ea9b1edc194ade4ab5c43735e6775dbd45ab2 | 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 |