Viewing all changes in revision 631.
- Committer: l10n daemon script
- Date: 2020-04-04 04:31:48 UTC
- Revision ID: git-v1:ccf0bed69ff9d2b8d9376c1955fc482998f3d006
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:
- themes/crystal.desktop
expand all
collapse all
added
removed
