Viewing all changes in revision 1091.
- Committer: l10n daemon script
- Date: 2019-09-07 03:14:53 UTC
- Revision ID: git-v1:fac9b48698c6bc875e5de2a9d079c0779175abbd
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:
- layouts/cross.desktop
expand all
collapse all
added
removed
