| commit | 6167adb1a3a1687932569042dc175549a5d9919d | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 28 Feb 2016 09:25:19 +0000 (28 09:25 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 28 Feb 2016 09:25:19 +0000 (28 09:25 +0000) | ||
| tree | b558920121cffa43efb86587fdcb972fc4cfccd6 | treesnapshot (tar.gz zip) |
| parent | 8897676a3308bfc166b1996dc6b0ceef4267e20b | 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"