Fix build issues caused by merge (#14)

eusoff-hackers · Oct 14, 2024 · c361916 · c361916
1 parent 608719e
commit c361916
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/app/dashboard/jersey/types.ts b/src/app/dashboard/jersey/types.ts
@@ -3,40 +3,30 @@ export interface UserInfo {
   points: number;
   isAllocated: boolean;
   jersey?: JerseyType; // Only present if isAllocated is true
-<<<<<<< HEAD
-  teams: Team[];
-=======
   teams: TeamContainer[];
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 }
 
 export interface JerseyType {
   number: number;
   quota: Quota;
 }
 
-<<<<<<< HEAD
-=======
 export interface EligibleBids {
   jerseys: number[];
 }
 
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 export interface Quota {
   male: number;
   female: number;
 }
 
 interface Team {
   name: string;
-<<<<<<< HEAD
-=======
   shareable: boolean;
 }
 
 interface TeamContainer {
   team: Team;
->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf
 }
 
 interface Bid {