From c36191672b526c38aa447ee1855c92d93b837b6c Mon Sep 17 00:00:00 2001 From: juancarlovieri <53759730+juancarlovieri@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:27:44 +0800 Subject: [PATCH] Fix build issues caused by merge (#14) --- src/app/dashboard/jersey/types.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/app/dashboard/jersey/types.ts b/src/app/dashboard/jersey/types.ts index 21a69f1..7009bcb 100644 --- a/src/app/dashboard/jersey/types.ts +++ b/src/app/dashboard/jersey/types.ts @@ -3,11 +3,7 @@ export interface UserInfo { points: number; isAllocated: boolean; jersey?: JerseyType; // Only present if isAllocated is true -<<<<<<< HEAD - teams: Team[]; -======= teams: TeamContainer[]; ->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf } export interface JerseyType { @@ -15,13 +11,10 @@ export interface JerseyType { quota: Quota; } -<<<<<<< HEAD -======= export interface EligibleBids { jerseys: number[]; } ->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf export interface Quota { male: number; female: number; @@ -29,14 +22,11 @@ export interface Quota { interface Team { name: string; -<<<<<<< HEAD -======= shareable: boolean; } interface TeamContainer { team: Team; ->>>>>>> 81df05bbaae3cbaa3ef923043f4dd1a0af505bbf } interface Bid {