| commit | 74e855e695e9f8427b109170f895e6a9190e7cf7 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 5 Feb 2016 09:19:07 +0000 (5 09:19 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 5 Feb 2016 09:19:07 +0000 (5 09:19 +0000) | ||
| tree | d684742ec59e06a5da68bde7b53af2795f8e3227 | treesnapshot (tar.gz zip) |
| parent | 3fea2e0aea71a90cf3b00cf4138c7c3b29a037b2 | 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/korganizer/kcmtodosummary.desktop | diffblobblamehistory |