Viewing all changes in revision 2587.
- Committer: l10n daemon script
- Date: 2018-02-21 04:20:08 UTC
- Revision ID: git-v1:9c5596fe4458d7ccf74c9b331e51a6959e051674
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:
- juk.notifyrc
expand all
collapse all
added
removed
