| commit | 14e424a3ca51d1d0e965fbc6863838636c92bee4 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 23 Jul 2016 03:33:28 +0000 (23 03:33 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 23 Jul 2016 03:33:28 +0000 (23 03:33 +0000) | ||
| tree | a7e9428fdacba0e6ec8958bb27df5ad27b7e51f0 | treesnapshot (tar.gz zip) |
| parent | 515aa406471d7ba33937345d831eba7b0ff8df5c | 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 |