Viewing all changes in revision 2650.
- Committer: l10n daemon script
- Date: 2015-05-25 04:26:59 UTC
- Revision ID: git-v1:33b909c5587f548c3736f49681d750f80a782f37
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"
- files modified:
- transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop
expand all
collapse all
added
removed
