| commit | 833b83db9176215aad3f7d8e0a2ef36ed79019e8 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 30 Sep 2015 10:02:45 +0000 (30 10:02 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 30 Sep 2015 10:02:45 +0000 (30 10:02 +0000) | ||
| tree | 19c30483158674fcef5e3fa07fcecf29cbc8fa5a | treesnapshot (tar.gz zip) |
| parent | 7ff5dfc3b7387a69d18a052ef79d29a571aad21d | 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"
| messageviewer/src/viewerplugins/createnoteplugin/messageviewer_createnoteplugin.desktop | diffblobblamehistory |