diff options
| author | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
| commit | 25999b25f6b9ef87aa26013c57f72dd4e25b97b9 (patch) | |
| tree | 2dee64e9c449bfd69a4307878cbef9734c1f6ab9 /.flatpak-vlc-ignore-time-for-cache.patch.license | |
| parent | eabed6e1f1d0aa9e25fc73f540250232ec9edc55 (diff) | |
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"
Diffstat (limited to '.flatpak-vlc-ignore-time-for-cache.patch.license')
0 files changed, 0 insertions, 0 deletions