| commit | 1eba5f162d509df69b2cd2073e7d1c22852e3269 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 18 Jan 2016 14:14:04 +0000 (18 14:14 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 18 Jan 2016 14:14:04 +0000 (18 14:14 +0000) | ||
| tree | a8963174c2b80448d9d623a0c8c615da1dfb0041 | treesnapshot (tar.gz zip) |
| parent | 954d05e9fdf24ad6e337ec22fe35b3c65124b3cf | 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 |