resolve confilict

2026-09-08 03:05:42 +00:00 · 2026-06-05 14:07:26 +03:00
parent d59c192137 21d443db15
commit 35c9bdfce4
40 changed files with 3823 additions and 768 deletions
--- a/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/wagon.service.ts
@@ -1,4 +1,4 @@
-import { apiClient } from '@/lib/axios';
+import { api as apiClient } from "../auth/http";

 export interface Wagon {
  id: string;