Viewing all changes in revision 1278.
- Committer: l10n daemon script
- Date: 2023-11-04 11:59:28 UTC
- Revision ID: git-v1:f38f3b927db680937c57e7174e095c2a3299b0e5
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"
expand all
collapse all
added
removed
