fix(amazonqFeatureDev): fix merge conflicts

tverney · tverney · commit 709c0c5e0fcc · 2024-09-27T13:41:54.000-04:00
diff --git a/packages/core/src/amazonqFeatureDev/types.ts b/packages/core/src/amazonqFeatureDev/types.ts
@@ -61,7 +61,6 @@ export interface SessionState {
     readonly phase?: SessionStatePhase
     readonly uploadId: string
     readonly currentCodeGenerationId?: string
-    approach: string
     tokenSource?: CancellationTokenSource
     readonly tabID: string
     interact(action: SessionStateAction): Promise<SessionStateInteraction>
