| commit | a2826bd6299899a999b3b84a28b509b3d054e548 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 3 Mar 2016 09:55:31 +0000 (3 09:55 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 3 Mar 2016 09:55:31 +0000 (3 09:55 +0000) | ||
| tree | 6f1fe4406c980fdf1979a51802e1493befeec9e9 | treesnapshot (tar.gz zip) |
| parent | 3e279d736c5bf6996f040ded9bc194c2e6e69f5b | 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"
| korganizer/kontactplugin/specialdates/kcmsdsummary.desktop | diffblobblamehistory |