| commit | 87756798c61c9c5194a2ec3f1c62c45c3f0f654a | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 30 May 2016 11:18:58 +0000 (30 11:18 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 30 May 2016 11:18:58 +0000 (30 11:18 +0000) | ||
| tree | d2ab1e2a8bfb060c5d1f37871d9baedcb52c16fe | treesnapshot (tar.gz zip) |
| parent | f1f1918ad6da5aa5fdfb604bac6fb25a4a854422 | 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 |