| commit | 553ce6eac97f7a7b66747f0d13f2e6983114b390 | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 5 Jan 2016 13:25:47 +0000 (5 13:25 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 5 Jan 2016 13:25:47 +0000 (5 13:25 +0000) | ||
| tree | 6c045c8c687e1784ac1f5d1218ec16bf0e8a1d26 | treesnapshot (tar.gz zip) |
| parent | 7213d1ad8ef40f9e52b7c8325cd2782592fc632c | 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"