fix conflict

Browse Source

...

This commit is contained in:

yaschalew

2026-06-13 14:37:13 +03:00

parent eee7b719b0

commit b417ed2fc8

1 changed files with 1 additions and 1 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

apps/edr-freight-web/backoffice/user-management

Submodule apps/edr-freight-web/backoffice/user-management updated: 5b6a377fa2...7c2e1d9bdf