| commit | e5d1fec6e8962709a3550a93042f7e17536b272c | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 21 Oct 2015 10:14:05 +0000 (21 10:14 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 21 Oct 2015 10:14:05 +0000 (21 10:14 +0000) | ||
| tree | 3dce7909949c6a053cb92f750ab79252edfa4a7b | treesnapshot (tar.gz zip) |
| parent | d42987b9068f27f4219ccad806d55b30c19ab0eb | 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"
| pimcommon/src/storageservice/gdriveplugin/pimcommon_gdriveplugin.desktop | diffblobblamehistory | |
| pimcommon/src/storageservice/webdavplugin/pimcommon_webdavplugin.desktop | diffblobblamehistory |