Viewing all changes in revision 951.
- Committer: l10n daemon script
- Date: 2018-06-12 03:41:45 UTC
- Revision ID: git-v1:e0223397433b23e8f98f7596bac8fce643072fab
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:
- servicemenus/kompare.desktop
expand all
collapse all
added
removed
