mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-29 04:50:54 +00:00
resolve confilict
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
import { apiClient } from '@/lib/axios';
|
||||
// import { apiClient } from '@/lib/axios';
|
||||
import { api as apiClient } from "../auth/http";
|
||||
|
||||
|
||||
export interface Cargo {
|
||||
id: string;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { apiClient } from '@/lib/axios';
|
||||
// import { apiClient } from '@/lib/axios';
|
||||
import { api as apiClient } from "../auth/http";
|
||||
|
||||
|
||||
export interface Container {
|
||||
id: string;
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { apiClient } from '@/lib/axios';
|
||||
// import { apiClient } from '@/lib/axios';
|
||||
import { api as apiClient } from "../auth/http";
|
||||
|
||||
|
||||
export interface Train {
|
||||
id: string;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { apiClient } from '@/lib/axios';
|
||||
import { api as apiClient } from "../auth/http";
|
||||
|
||||
export interface Wagon {
|
||||
id: string;
|
||||
|
||||
Reference in New Issue
Block a user