Viewing all changes in revision 1225.
- Committer: l10n daemon script
- Date: 2019-09-07 03:10:44 UTC
- Revision ID: git-v1:70e3516364260641ec33d4e2805459f879c05a37
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:
- utils/qapt-deb-installer/qapt-deb-installer.desktop
expand all
collapse all
added
removed
