| commit | af490337d2e838c117755f391d60b089d90c7370 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 4 Mar 2016 09:13:06 +0000 (4 09:13 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 4 Mar 2016 09:13:06 +0000 (4 09:13 +0000) | ||
| tree | e6c97d98b79ff9dc4140495fd1c68377a776393c | treesnapshot (tar.gz zip) |
| parent | 89e245d2d4732bbedf937797e34e8d3ea8cd0095 | 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"
12 files changed: