Viewing all changes in revision 369.
- Committer: l10n daemon script
- Date: 2019-05-12 04:02:25 UTC
- Revision ID: git-v1:21e05e549939168a552b4fcfb3d8f6e52b2f7bb0
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:
- src/user_manager.desktop
expand all
collapse all
added
removed
