Viewing all changes in revision 971.
- Committer: l10n daemon script
- Date: 2019-03-03 04:35:26 UTC
- Revision ID: git-v1:63fd5d6acc4875aa678cdc3c900a898978a37f61
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:
- sounds/kreversi.notifyrc
expand all
collapse all
added
removed
