| commit | 064bd52ccd840b2a0e5fef97c6d1e62a21479905 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 12 Aug 2016 12:05:24 +0000 (12 12:05 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 12 Aug 2016 12:05:24 +0000 (12 12:05 +0000) | ||
| tree | c0d4ea77122b76cb86cb7a567d40357fd17b26f1 | treesnapshot (tar.gz zip) |
| parent | 55057d23249a1a537bc52f59087c7eb1157fdaae | 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"
| akregator/configuration/akregator_config_webengineurlinterceptor.desktop | diffblobblamehistory | |
| kmail/src/data/org.kde.kmail.desktop | diffblobblamehistory |