Fix merge conflicts

This commit is contained in:
Adria Navarro 2024-09-03 11:28:43 +02:00
parent 3cee97aa02
commit 14bc9a7390
1 changed files with 1 additions and 1 deletions

View File

@ -51,7 +51,7 @@ export enum CalculationType {
MAX = "max", MAX = "max",
} }
export type ViewCalculationFieldMetadata = ViewUIFieldMetadata & { export type ViewCalculationFieldMetadata = ViewFieldMetadata & {
calculationType: CalculationType calculationType: CalculationType
field: string field: string
} }