Viewing all changes in revision 3391.
- Committer: l10n daemon script
- Date: 2018-12-18 04:34:05 UTC
- Revision ID: git-v1:a0bef7ddaff30cd7a6998089ffec5d5d65f2002d
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:
- compoundviewer/kalziumgl_part.desktop
expand all
collapse all
added
removed
