Viewing all changes in revision 616.
- Committer: l10n daemon script
- Date: 2018-10-10 04:36:34 UTC
- Revision ID: git-v1:4d0dc1c7e9480106bdd04f476669e526ae71b145
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/egyptian.desktop
expand all
collapse all
added
removed
