Viewing all changes in revision 746.
- Committer: l10n daemon script
- Date: 2017-02-03 01:06:11 UTC
- Revision ID: git-v1:63783eedaccd7872b6ef7a0a7fddf3e643562a46
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
