Viewing all changes in revision 413.
- Committer: l10n daemon script
- Date: 2018-03-26 03:08:55 UTC
- Revision ID: git-v1:73a934df6ca773a146af785df84763081b7541fa
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:
- kuiviewer/org.kde.kuiviewer.desktop
expand all
collapse all
added
removed
