| commit | 5df79ecd3cdcd41ee3cadebe9f0cfc6e1c8349e6 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 27 Feb 2016 09:30:26 +0000 (27 09:30 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 27 Feb 2016 09:30:26 +0000 (27 09:30 +0000) | ||
| tree | ea4476cddee669cdb93a7a5ba2f05471311ab4f2 | treesnapshot (tar.gz zip) |
| parent | cd7072071a46eca69114afdb5830f31fdb2930e0 | 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 |