From e0ee13290fc150c8de6ac1d34f36167430e463ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Catriel=20M=C3=BCller?= <catrielmuller@gmail.com>
Date: Fri, 22 May 2026 10:44:54 -0300
Subject: [PATCH] fix: merge

---
 packages/sdk/js/src/v2/gen/types.gen.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/sdk/js/src/v2/gen/types.gen.ts b/packages/sdk/js/src/v2/gen/types.gen.ts
index e09eb494691..a6d9eee91ff 100644
--- a/packages/sdk/js/src/v2/gen/types.gen.ts
+++ b/packages/sdk/js/src/v2/gen/types.gen.ts
@@ -1971,18 +1971,17 @@ export type Workspace = {
   projectID: string
 }
 
-<<<<<<< dynamic-department
 export type BackgroundProcessLogs = {
   id: string
   sessionID: string
   output: string
-=======
+}
+
 export type WorkspaceWarpError = {
   name: "WorkspaceWarpError"
   data: {
     message: string
   }
->>>>>>> main
 }
 
 export type EffectHttpApiErrorUnauthorized = {