| commit | aa8b0a93293edb5da09314304c8026dd2b98f783 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 23 Sep 2015 10:12:56 +0000 (23 10:12 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 23 Sep 2015 10:12:56 +0000 (23 10:12 +0000) | ||
| tree | ebf245d6c531f2e3afdca02ee70f5c77aebefbfd | treesnapshot (tar.gz zip) |
| parent | c2bc619a69565f2100a00bdb53a3b5b73fe7b306 | 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/header/grantleeheaderstyleplugin/messageviewer_grantleeheaderstyleplugin.desktop | diffblobblamehistory |