SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source

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"

remotes/origin/pdfium_generator

l10n daemon script 9 years ago

parent 854d997fd5

commit da42e4b166

16 changed files with 16 additions and 16 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save