Viewing all changes in revision 833.
- Committer: l10n daemon script
- Date: 2018-03-14 04:17:37 UTC
- Revision ID: git-v1:27997a093cddf004773ec5b3d395c0735f566772
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/org.kde.kgeography.desktop
expand all
collapse all
added
removed
