| commit | 8cfffb23272d05e82667cddd9814f337ae23cc15 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 10 Dec 2015 09:13:33 +0000 (10 09:13 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 10 Dec 2015 09:13:33 +0000 (10 09:13 +0000) | ||
| tree | a331368c1cd25e0c908df512b3b967301ab33e2a | treesnapshot (tar.gz zip) |
| parent | 4c3774ebffb4d452094a6a4dbb11b1f8cca9c270 | 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"