| commit | bd70a53816b8a461eae6a240d88ca58b62757103 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 6 Aug 2016 12:42:14 +0000 (6 12:42 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 6 Aug 2016 12:42:14 +0000 (6 12:42 +0000) | ||
| tree | a4d7f03a83849bd504ef35e8180f84ebfc4455f5 | treesnapshot (tar.gz zip) |
| parent | b7fbe4f24b5608c2509a127b6995ba5cdb72d534 | 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 |