« back to all changes in this revision
Viewing changes to plugins/owncloud-ui/package/metadata.desktop
- Committer: l10n daemon script
- Date: 2017-11-29 06:46:46 UTC
- Revision ID: git-v1:601064104f07fd7cc4345219d5a72e70c8be6449
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
added
removed
plugins/owncloud-ui/package/metadata.desktop
