| commit | 4e5a26766e76c80ac2e257709f3ff4bafec760d0 | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 4 Aug 2015 07:17:02 +0000 (4 07:17 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 4 Aug 2015 07:17:02 +0000 (4 07:17 +0000) | ||
| tree | 8b5b731cad87c062debea02fe47046f8c4d73c3f | treesnapshot (tar.gz zip) |
| parent | 3725c3d8dcf8000ed87cc858638b3690e5ba12f5 | 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 |