| commit | 24522e217bbdbac1d113f22a9741b38d63f6ed6b | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 7 Sep 2015 09:52:26 +0000 (7 09:52 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 7 Sep 2015 09:52:26 +0000 (7 09:52 +0000) | ||
| tree | 00f90326aec264d35f5b2a763ae04751003a55b2 | treesnapshot (tar.gz zip) |
| parent | 893c9f102d3022e8ae1fbd700ed9a14c25d5e033 | 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"
| pimcommon/customtools/shorturlplugin/pimcommon_shorturlplugin.desktop | diffblobblamehistory | |
| pimcommon/customtools/translatorplugin/pimcommon_translatorplugin.desktop | diffblobblamehistory |