Viewing all changes in revision 627.
- Committer: l10n daemon script
- Date: 2019-01-26 04:33:10 UTC
- Revision ID: git-v1:1be2fb1e99199754a71bc92bdddd207133dccf1e
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:
- grafix/blue.desktop
expand all
collapse all
added
removed
