Viewing all changes in revision 602.
- Committer: l10n daemon script
- Date: 2016-02-07 03:30:53 UTC
- Revision ID: git-v1:88f5145d259f6711aba6b24d259f4eb0a84a7a0c
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:
- ksnakeduel.desktop
expand all
collapse all
added
removed
