Fix merge conflicts

2024-09-03 11:28:43 +02:00 · 2024-09-03 11:28:43 +02:00 · 14bc9a7390
parent 3cee97aa02
commit 14bc9a7390
1 changed files with 1 additions and 1 deletions
--- a/packages/types/src/documents/app/view.ts
+++ b/packages/types/src/documents/app/view.ts
@ -51,7 +51,7 @@ export enum CalculationType {
  MAX = "max",
 }

-export type ViewCalculationFieldMetadata = ViewUIFieldMetadata & {
+export type ViewCalculationFieldMetadata = ViewFieldMetadata & {
  calculationType: CalculationType
  field: string
 }