Viewing all changes in revision 166.
- Committer: l10n daemon script
- Date: 2019-05-22 03:21:27 UTC
- Revision ID: git-v1:30ca377df93f89dc9d64db8605dd2eb2145b8d9f
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"
expand all
collapse all
added
removed
