Viewing all changes in revision 138.
- Committer: l10n daemon script
- Date: 2018-01-08 03:48:41 UTC
- Revision ID: git-v1:04847dadb5c0962827ada88c040a954020ef18bb
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:
- plugins/owncloud-ui/package/metadata.desktop
expand all
collapse all
added
removed
