fix merge conflict

tomcat323 · tomcat323 · commit 30c0f09c05fd · 2025-06-12T10:52:52.000-04:00
diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -172,7 +172,6 @@ export class EditDecorationManager {
         this.currentRemovedCodeDecorations = []
         this.acceptHandler = undefined
         this.rejectHandler = undefined
-        // Clear context to allow normal Tab key behavior
         void setContext('amazonq.editSuggestionActive' as any, false)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,6 @@ export class EditDecorationManager {`
`172`	`172`	`this.currentRemovedCodeDecorations = []`
`173`	`173`	`this.acceptHandler = undefined`
`174`	`174`	`this.rejectHandler = undefined`
`175`		`- // Clear context to allow normal Tab key behavior`
`176`	`175`	`void setContext('amazonq.editSuggestionActive' as any, false)`
`177`	`176`	`}`
`178`	`177`