Viewing all changes in revision 135.
- Committer: l10n daemon script
- Date: 2017-12-09 03:37:56 UTC
- Revision ID: git-v1:214d47d22bc9c99d278232e4736e2cb56ea9e5d7
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
