| commit | 6a1ca72e4617c42161d86e9ce7b3180c64104ad9 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 17 Jul 2016 03:21:32 +0000 (17 03:21 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 17 Jul 2016 03:21:32 +0000 (17 03:21 +0000) | ||
| tree | d4d7b82fbe1d6e92e5ee64c94d80bd5e30ffb773 | treesnapshot (tar.gz zip) |
| parent | 1f802bfd5bb41f3eebd6fcc6c1222f637601d717 | 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 |