| commit | 0f2fabb42dce12fc9b8b55e02f552b4c8bba1566 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 2 Jan 2016 10:36:29 +0000 (2 10:36 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 2 Jan 2016 10:36:29 +0000 (2 10:36 +0000) | ||
| tree | f41da8a4a993368dfa8cb8ddb68284098e061dc1 | treesnapshot (tar.gz zip) |
| parent | eed05bfb63ab8f9f1e754839b3c66b54109df28e | 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"
| pimsettingexporter/gui/org.kde.pimsettingexporter.desktop | diffblobblamehistory |