Viewing all changes in revision 1088.
- Committer: l10n daemon script
- Date: 2019-07-31 03:15:15 UTC
- Revision ID: git-v1:39700f7b921a7ab2e20fbc82e09ae430d758cac1
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:
- layouts/cross.desktop
expand all
collapse all
added
removed
