| commit | 515aa406471d7ba33937345d831eba7b0ff8df5c | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 19 Jul 2016 03:45:30 +0000 (19 03:45 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 19 Jul 2016 03:45:30 +0000 (19 03:45 +0000) | ||
| tree | 2310e5cb3502f0ffef6006873249be37bf8395e6 | treesnapshot (tar.gz zip) |
| parent | 6a1ca72e4617c42161d86e9ce7b3180c64104ad9 | 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"
| src/Gui/trojita.desktop | diffblobblamehistory |