Viewing all changes in revision 2633.
- Committer: l10n daemon script
- Date: 2017-06-07 23:47:32 UTC
- Revision ID: git-v1:7f7b181124f142620fb2ba72237a582b2a9e20bf
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
