Viewing all changes in revision 3112.
- Committer: l10n daemon script
- Date: 2018-03-13 04:14:49 UTC
- Revision ID: git-v1:a4a3ab6af1eca9c3a8278889d844d6be882e0cf7
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:
- activeshellpackage/package/metadata.desktop
expand all
collapse all
added
removed
