| commit | 3d2c8e0771f332a367c29c61b930d9d1429ed635 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Jun 2016 10:49:57 +0000 (6 10:49 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Jun 2016 10:49:57 +0000 (6 10:49 +0000) | ||
| tree | 152b39dfc57a757112b7268a6dbb541c9aeccf76 | treesnapshot (tar.gz zip) |
| parent | b808a919b445fda9518afb76b0bfabf896c21060 | 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 | |
| kmail/src/data/org.kde.kmail.desktop | diffblobblamehistory |