| commit | 8f55e2f7354717c9d72dedebfac9c13b5fa31f18 | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 26 Jul 2016 13:47:03 +0000 (26 13:47 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 26 Jul 2016 13:47:03 +0000 (26 13:47 +0000) | ||
| tree | 7abec7024855c9a7d494fb36fdcebf1a05eb1688 | treesnapshot (tar.gz zip) |
| parent | 2d9b019dda308ba8fcc63a52acab34ae6843d6ad | 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 |