Fix merge conflicts
This commit is contained in:
parent
3cee97aa02
commit
14bc9a7390
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue