Viewing all changes in revision 3126.
- Committer: l10n daemon script
- Date: 2019-07-24 03:28:13 UTC
- Revision ID: git-v1:b4cd5b23f6f72ae2e5cbb4b7a015275973f6f423
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:
- containments/activityscreen/metadata.desktop
expand all
collapse all
added
removed
