conflict fixed

This commit is contained in:
2025-12-11 09:58:29 +03:00
9 changed files with 138 additions and 0 deletions
+2
View File
@@ -9,6 +9,7 @@ import { ItemModule } from './item/item.module';
import { FileModule } from './file/file.module';
import { RedisModule } from './redis/redis.module';
import { CacheModule } from './cache/cache.module';
import { ContactModule } from './contact/contact.module';
@Module({
imports: [
@@ -21,6 +22,7 @@ import { CacheModule } from './cache/cache.module';
FileModule,
RedisModule,
CacheModule,
ContactModule,
],
})
export class AppModule {}