« back to all changes in this revision
Viewing changes to carddecks/svg-oxygen-air/index.desktop
- Committer: l10n daemon script
- Date: 2019-10-23 03:26:31 UTC
- Revision ID: git-v1:0b2ec5ed0a18243520f1e1936324018fe41ffa27
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:
- carddecks/svg-ancient-egyptians/index.desktop
added
removed
carddecks/svg-oxygen-air/index.desktop
