Viewing all changes in revision 1201.
- Committer: l10n daemon script
- Date: 2018-06-20 03:47:59 UTC
- Revision ID: git-v1:725c6a14f322fe937d58c875b56eff2034bea313
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
