SchoolTask/jpe-controle
1
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity Actions

modif conflix

Browse source
This commit is contained in:
ExostFlash 2025-06-03 09:03:09 +02:00
parent 39de6138d6
commit b7b7539a79
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FencerJudgeFront/src/app/components/home/home.component.ts
View file

@ -1,8 +1,6 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { MatchesService } from '@services/matches/matches.service'; import { MatchesService } from '@services/matches/matches.service';
<<<<<<< HEAD
=======
import { Matches, MatchState } from '@interfaces/matches'; import { Matches, MatchState } from '@interfaces/matches';
import { PlayerService } from '@services/player/player.service'; import { PlayerService } from '@services/player/player.service';
@ -10,7 +8,6 @@ import { Player } from '@interfaces/player';
import { RefereeService } from '@services/referee/referee.service'; import { RefereeService } from '@services/referee/referee.service';
import { Referee, RefereeLevel } from '@interfaces/referee'; import { Referee, RefereeLevel } from '@interfaces/referee';
>>>>>>> feature/front
@Component({ @Component({
selector: 'app-home', selector: 'app-home',

2
FencerJudgeFront/src/app/services/matches/matches.service.ts
View file

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable, Subject, BehaviorSubject } from 'rxjs'; import { Observable, Subject, BehaviorSubject, of } from 'rxjs';
import { Matches, MatchState } from '@interfaces/matches'; import { Matches, MatchState } from '@interfaces/matches';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })