Viewing all changes in revision 477.
- Committer: l10n daemon script
- Date: 2019-01-06 04:34:06 UTC
- Revision ID: git-v1:d0245ef7e230d2c009fd90021a0c25160740973c
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/invisible.desktop
expand all
collapse all
added
removed
