| commit | 60903d087cab6ab46631e695b0b939387b92de3c | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 20 May 2019 03:28:59 +0000 (20 05:28 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 20 May 2019 03:28:59 +0000 (20 05:28 +0200) | ||
| tree | 5327cf2b26ea36118902c797dfb982ce609062bc | treesnapshot (tar.gz zip) |
| parent | b98e2a80c47481e0f9589861a6dc72daf3c34132 | 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 |