| commit | 3725c3d8dcf8000ed87cc858638b3690e5ba12f5 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 31 Jul 2015 04:10:35 +0000 (31 04:10 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 31 Jul 2015 04:10:35 +0000 (31 04:10 +0000) | ||
| tree | f70917e0c1faab74fb420adad22bc0de28c5b714 | treesnapshot (tar.gz zip) |
| parent | 30f6cc345c687a92ded35d28c938960af7d92ac4 | 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 |