Viewing all changes in revision 62.
- Committer: l10n daemon script
- Date: 2016-01-22 03:44:49 UTC
- Revision ID: git-v1:52c64a65d42e839597b54759d81247abd61a62b7
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:
- ksane_scan_service.desktop
expand all
collapse all
added
removed
