| commit | b275198cc69b56d1be9449f00f44dc5447feb49a | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 22 Oct 2017 02:37:56 +0000 (22 04:37 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 22 Oct 2017 02:37:56 +0000 (22 04:37 +0200) | ||
| tree | 08aba33c23ae28c99396ca552d8552613682608b | treesnapshot (tar.gz zip) |
| parent | e5ac7890ad09d2bd71c75ede421860b99e02290b | 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 |