Merge remote-tracking branch 'origin/main'

SerpentRace_Backend/src/Application/Services/DIContainer.ts

@@ -60,9 +60,12 @@ import { EmailService } from './EmailService';
 import { GameTokenService } from './GameTokenService';
 import { ContactEmailService } from './ContactEmailService';
 import { DeckImportExportService } from './DeckImportExportService';
+<<<<<<< HEAD
 import { FieldEffectService } from './FieldEffectService';
 import { CardDrawingService } from './CardDrawingService';
 import { GamemasterService } from './GamemasterService';
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
 import { RedisService } from './RedisService';
 import { GameService } from '../Game/GameService';
 import { BoardGenerationService } from '../Game/BoardGenerationService';
@@ -90,9 +93,12 @@ export class DIContainer {
     private _gameTokenService: GameTokenService | null = null;
     private _contactEmailService: ContactEmailService | null = null;
     private _deckImportExportService: DeckImportExportService | null = null;
+<<<<<<< HEAD
     private _cardDrawingService: CardDrawingService | null = null;
     private _gamemasterService: GamemasterService | null = null;
     private _fieldEffectService: FieldEffectService | null = null;
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     private _gameService: GameService | null = null;
     private _boardGenerationService: BoardGenerationService | null = null;
     
@@ -232,6 +238,7 @@ export class DIContainer {
         return this._deckImportExportService;
     }
 
+<<<<<<< HEAD
     public get cardDrawingService(): CardDrawingService {
         if (!this._cardDrawingService) {
             this._cardDrawingService = new CardDrawingService();
@@ -256,6 +263,8 @@ export class DIContainer {
         return this._fieldEffectService;
     }
 
+=======
+>>>>>>> 83fad59878db015ec8d86bdec1ecbbca0baddfd2
     public get gameService(): GameService {
         if (!this._gameService) {
             this._gameService = new GameService();