Viewing all changes in revision 617.
- Committer: l10n daemon script
- Date: 2019-01-06 04:33:50 UTC
- Revision ID: git-v1:abdf4164445572930c3edd62e9edc23116541147
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:
- themes/highcontrast/themerc
expand all
collapse all
added
removed
