| commit | 1ff4820c707d9f4fdd7f6f9d8f7864edaf91e258 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 10 Oct 2016 12:25:30 +0000 (10 12:25 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 10 Oct 2016 12:25:30 +0000 (10 12:25 +0000) | ||
| tree | 62d6f2ee32858a712459383922921b20a8937fff | treesnapshot (tar.gz zip) |
| parent | bd04911af38d9aaa5d43d51b8b07a9101084f8ea | 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"
| akonadiconsole/src/org.kde.akonadiconsole.desktop | diffblobblamehistory |