| commit | f8a19e92da4cb1331a41080d6f69285fbcd14453 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 4 Jun 2016 09:49:09 +0000 (4 09:49 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 4 Jun 2016 09:49:09 +0000 (4 09:49 +0000) | ||
| tree | 4d0389c40669ebc96a5a696e8f0469e402acc5e0 | treesnapshot (tar.gz zip) |
| parent | aaedfd5756f20b251c221dad5d55cdb200124284 | 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 |