mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-26 18:42:49 +00:00
resolve confilict
This commit is contained in:
@@ -38,6 +38,7 @@ import {
|
||||
import { EdrOrgSeeder } from "./seed/edr-org.seeder";
|
||||
import { DemoUsersSeeder } from "./seed/demo-users.seeder";
|
||||
import { FreightStaffUsersSeeder } from "./seed/freight-staff-users.seeder";
|
||||
import { PaymentModule } from "./modules/payment/payment.module";
|
||||
import { DemoBookingsSeeder } from "./seed/demo-bookings.seeder";
|
||||
import { PricingDataSeeder } from "./seed/pricing-data.seeder";
|
||||
import { FileUploadSettingsSeeder } from "./seed/file-upload-settings.seeder";
|
||||
@@ -92,6 +93,7 @@ import { CargoesModule } from './modules/cargoes/cargoes.module';
|
||||
BackofficeModule,
|
||||
DemoPermissionsModule,
|
||||
FreightAuthModule,
|
||||
PaymentModule,
|
||||
//New Modules
|
||||
TrainsModule,
|
||||
WagonsModule,
|
||||
|
||||
Reference in New Issue
Block a user