From 14bc9a7390da04eed94f8f9243122d0afca93f84 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 3 Sep 2024 11:28:43 +0200
Subject: [PATCH] Fix merge conflicts

---
 packages/types/src/documents/app/view.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts
index b12c61764d..b5fdcacefe 100644
--- 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
 }