| commit | cd32511e035463bb83c2027f1cbb98ac4f794794 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 6 Mar 2016 09:15:49 +0000 (6 09:15 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 6 Mar 2016 09:15:49 +0000 (6 09:15 +0000) | ||
| tree | c88db6e75bf84ecefd4fc7cbebb9c0ea99b5f796 | treesnapshot (tar.gz zip) |
| parent | cfa4426613668e591f9a599aa6f705e1bb4176c0 | 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"
| accountwizard/org.kde.accountwizard.desktop | diffblobblamehistory |