| commit | 8a51c6a2280ccbf96f81f1f934b1537925210a0a | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 28 Sep 2016 11:53:10 +0000 (28 11:53 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 28 Sep 2016 11:53:10 +0000 (28 11:53 +0000) | ||
| tree | 95cabb6c7855d9a330adeff562a240308d274998 | treesnapshot (tar.gz zip) |
| parent | 7fd4496b2f268855a89b91b9c52f467c0dbdcd98 | 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 |