Viewing all changes in revision 716.
- Committer: l10n daemon script
- Date: 2019-07-14 03:16:28 UTC
- Revision ID: git-v1:5690484c74b630c242d3d75843778b04a05363be
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:
- samba/filepropertiesplugin/sambausershareplugin.desktop
expand all
collapse all
added
removed
