From e2e72075c93487bd414e31e73832a1d685d5ae7e Mon Sep 17 00:00:00 2001 From: marshal Date: Thu, 2 Jul 2026 22:08:02 +0300 Subject: [PATCH] merge conflickt --- apps/edr-freight-web/backoffice/src/constants/apiConfig.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts index 842276815..69e057da7 100644 --- a/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts +++ b/apps/edr-freight-web/backoffice/src/constants/apiConfig.ts @@ -1,6 +1,6 @@ -export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL; +// export const API_BASE_URL = import.meta.env.VITE_BASE_API_URL; -// export const API_BASE_URL = 'http://localhost:3001'; +export const API_BASE_URL = 'http://localhost:3001'; /** * URL that streams an uploaded file through the API by its UUID. Routes the