Fix merge conflict

Browse Source

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

...

This commit is contained in:

Stefan Parviainen

2017-10-12 22:18:50 +02:00

parent f694fb24ff 047daec587

commit 45137f030b

25 changed files with 1408 additions and 445 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

src/i18n/strings/fr.json

+308 -290

File diff suppressed because it is too large Load Diff