| commit | 438c9356297dfb570162e915723655dee21cb700 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 3 Feb 2016 09:26:23 +0000 (3 09:26 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 3 Feb 2016 09:26:23 +0000 (3 09:26 +0000) | ||
| tree | f2ffaf9e2c6df1a30cdd3e1766f50a453acc60ff | treesnapshot (tar.gz zip) |
| parent | 747f918a88303256dac54acecab627c3ad527c66 | 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"