« back to all changes in this revision
Viewing changes to encryptfile.desktop
- Committer: l10n daemon script
- Date: 2018-04-03 03:31:55 UTC
- Revision ID: git-v1:3cc6a2001cc38809467ae9870cbb13de114110eb
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:
- encryptfile.desktop
added
removed
encryptfile.desktop
