| commit | ff0142ed92aef0bd6c85db6a0cb74a1540b1a073 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 4 Sep 2015 09:50:56 +0000 (4 09:50 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 4 Sep 2015 09:50:56 +0000 (4 09:50 +0000) | ||
| tree | 2bb52a5e4f14f5e227bb08f7362de93f05ece0ac | treesnapshot (tar.gz zip) |
| parent | a8e283e9242d3edb80603c4db0b29dd07dcc27cb | 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 |