| commit | 5ef69b97c60c2fd3311bf8eedad200aac055f708 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 24 Feb 2019 04:28:27 +0000 (24 05:28 +0100) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 24 Feb 2019 04:28:27 +0000 (24 05:28 +0100) | ||
| tree | 80b735c5d2f97b6768b4fd5ba19bf62069207300 | treesnapshot (tar.gz zip) |
| parent | 7c85fcd9d4cf13052e0970d34b3155f703c65198 | 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/org.kde.trojita.desktop | diffblobblamehistory |