Viewing all changes in revision 1892.
- Committer: l10n daemon script
- Date: 2015-04-03 04:45:40 UTC
- Revision ID: git-v1:be2c927ee6696444215b726044516a69a133390a
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:
- kmix.desktop
expand all
collapse all
added
removed
