Viewing all changes in revision 662.
- Committer: l10n daemon script
- Date: 2020-06-02 03:16:32 UTC
- Revision ID: git-v1:e0d246921be22b9f29b287349b0063e664f90b42
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:
- data/billyrc
expand all
collapse all
added
removed
