Fixing merge conflicts

Browse Source

...

This commit is contained in:

nossr50

2019-04-03 17:25:18 -07:00

parent 7bbf1acd5d b68feb6992

commit 8991c2bf2c

15 changed files with 710 additions and 642 deletions

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

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

1274

src/main/resources/locale/locale_de.properties

File diff suppressed because it is too large Load Diff