| commit | 08f6fe380067d7241ed78019705a7725eafc14e3 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 3 Apr 2015 04:41:49 +0000 (3 04:41 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 3 Apr 2015 04:41:49 +0000 (3 04:41 +0000) | ||
| tree | 4f10eca594b5821c516351206054efe6dcb515b8 | treesnapshot (tar.gz zip) |
| parent | 34d708ec310fbee2e053705d996eee8c641651b2 | 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 | |
| src/Harmattan/trojita-tp.desktop | diffblobblamehistory | |
| src/Harmattan/trojita-tp_harmattan.desktop | diffblobblamehistory |