| commit | bf3b97e3e00706f6f743f186766f6e54152783c1 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 9 Apr 2016 09:57:09 +0000 (9 09:57 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 9 Apr 2016 09:57:09 +0000 (9 09:57 +0000) | ||
| tree | b0e0088b8097eef1e2ea5f4aa45531f9f761f4e3 | treesnapshot (tar.gz zip) |
| parent | 20acb141b04019858bea27fb8ccff333928c3bd0 | 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_webengineurlinterceptor.desktop | diffblobblamehistory |