| commit | c8e7b59cba588c5fd3e604fa7cbf7b2c63d2519f | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 5 Jun 2016 09:40:10 +0000 (5 09:40 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 5 Jun 2016 09:40:10 +0000 (5 09:40 +0000) | ||
| tree | ec760666171547e8219d03837028e63ffee1889e | treesnapshot (tar.gz zip) |
| parent | 83f4c1a7d427b8841a964f5d3a6c4bb2f2b20d21 | 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"
| kmail/src/data/org.kde.kmail.desktop | diffblobblamehistory |