fix: merge conflicts

Browse Source

...

This commit is contained in:

Ephraim Atta-Duncan

2024-11-15 11:03:52 +00:00

parent 63c98949bb 876803b5db

commit 21d68f3275

331 changed files with 23123 additions and 3629 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

2

packages/lib/translations/fr/web.js

File diff suppressed because one or more lines are too long