| commit | ed6fe4bf1f03810e6f396907af70cad0d8b9ad9d | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 12 Sep 2015 11:51:59 +0000 (12 11:51 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 12 Sep 2015 11:51:59 +0000 (12 11:51 +0000) | ||
| tree | 0933ba395663cc8951c008919f507f99cbf8c7de | treesnapshot (tar.gz zip) |
| parent | fdd4c086a3f531a32f76d1d308397f89134352dc | 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"