fix merge conflict

tomcat323 · tomcat323 · commit e7208cb4a872 · 2025-06-10T15:47:10.000-04:00
diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -144,7 +144,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
`@@ -144,7 +144,6 @@ export class EditDecorationManager {`
`144`	`144`	`this.currentRemovedCodeDecorations = []`
`145`	`145`	`this.acceptHandler = undefined`
`146`	`146`	`this.rejectHandler = undefined`
`147`		`- // Clear context to allow normal Tab key behavior`
`148`	`147`	`void setContext('amazonq.editSuggestionActive' as any, false)`
`149`	`148`	`}`
`150`	`149`