| commit | 5f006f8d68ab1ee2b6fdd14daa49fb3cb0c57d96 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 9 Jan 2016 10:02:45 +0000 (9 10:02 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 9 Jan 2016 10:02:45 +0000 (9 10:02 +0000) | ||
| tree | 65f3d34207ab344b9052ef55b3e7002a0dd0e610 | treesnapshot (tar.gz zip) |
| parent | ccc1d07a26e393168f48da4ecf952cfff5b0e462 | 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/org.kde.akonadiconsole.desktop | diffblobblamehistory |