| commit | f122cd722276a809217c5a0092448a800b2765e7 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 11 Apr 2016 10:22:33 +0000 (11 10:22 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 11 Apr 2016 10:22:33 +0000 (11 10:22 +0000) | ||
| tree | 066ef53ea8f80f04b29d512876b91378314d4d3e | treesnapshot (tar.gz zip) |
| parent | 2fe253e25575e51ad7c4a07d6b4a1512f77d1ff8 | 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 |