Fix merge conflict

Browse Source

...

This commit is contained in:

Bernd Bestel 2020-03-25 20:17:43 +01:00 committed by GitHub

parent f262bcb8d8

commit 7fcf3b6eb4

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

1 changed files with 0 additions and 1749 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1749

localization/strings.pot

View File

File diff suppressed because it is too large Load Diff