| commit | 961af0a534629edec6084c291b129b53dfb214e2 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 20 Aug 2016 12:16:28 +0000 (20 12:16 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 20 Aug 2016 12:16:28 +0000 (20 12:16 +0000) | ||
| tree | 1c2e46aa1fe65457a4f491ae68a64c0d16393b2d | treesnapshot (tar.gz zip) |
| parent | 3d605738d9714f82e8f7d3f83905ffc71a88dc7c | 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"
13 files changed: