From b417ed2fc887cf299f629460a3f6ab8d57e09e51 Mon Sep 17 00:00:00 2001 From: yaschalew Date: Sat, 13 Jun 2026 14:37:13 +0300 Subject: [PATCH] fix conflict --- apps/edr-freight-web/backoffice/user-management | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/edr-freight-web/backoffice/user-management b/apps/edr-freight-web/backoffice/user-management index 5b6a377fa..7c2e1d9bd 160000 --- a/apps/edr-freight-web/backoffice/user-management +++ b/apps/edr-freight-web/backoffice/user-management @@ -1 +1 @@ -Subproject commit 5b6a377fa2d92dab34b3df8362364e38cc3230be +Subproject commit 7c2e1d9bdf42014ba4005838256222dcf6f065e4