| commit | 7ff5ba57a939de6dd913eac7cb4d11105f30915a | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 5 Nov 2015 04:15:30 +0000 (5 04:15 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 5 Nov 2015 04:15:30 +0000 (5 04:15 +0000) | ||
| tree | 9d49d82309ca5ba83d636b0bf525424fc989f7e4 | treesnapshot (tar.gz zip) |
| parent | beb96d10a4e1ef10ed817fd44143a9a035ed4435 | 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 |