Viewing all changes in revision 2634.
- Committer: l10n daemon script
- Date: 2017-06-08 23:49:13 UTC
- Revision ID: git-v1:c94093c13c11e84700ade1e0cd9b99d44d9da678
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:
- gstreamer/gstreamer.desktop.cmake
expand all
collapse all
added
removed
