| commit | cff0a21b19e44115b8ab98ad1eba1a499689a3af | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 13 Sep 2015 10:30:27 +0000 (13 10:30 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 13 Sep 2015 10:30:27 +0000 (13 10:30 +0000) | ||
| tree | 9595ea3d971a71828982b3fb304496e718bf5a2d | treesnapshot (tar.gz zip) |
| parent | 65c9f52d1c2ba110f4a6da02d3daff435a79de04 | 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"