Viewing all changes in revision 2697.
- Committer: l10n daemon script
- Date: 2022-06-09 02:13:09 UTC
- Revision ID: git-v1:16d1e86981e922880540cf7e2b60464adb16c1f8
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.muon.desktop
expand all
collapse all
added
removed
