fix: merge conflicts

Browse Source

...

This commit is contained in:

Ephraim Atta-Duncan

2025-10-20 14:03:43 +00:00

parent e5bbbab62a

commit 311815063b

6 changed files with 4648 additions and 336 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

830

packages/lib/translations/de/web.po

File diff suppressed because it is too large Load Diff

834

packages/lib/translations/en/web.po

File diff suppressed because it is too large Load Diff

830

packages/lib/translations/es/web.po

File diff suppressed because it is too large Load Diff

830

packages/lib/translations/fr/web.po

File diff suppressed because it is too large Load Diff

830

packages/lib/translations/it/web.po

File diff suppressed because it is too large Load Diff

830

packages/lib/translations/pl/web.po

File diff suppressed because it is too large Load Diff