resolve conflicts

David Hasani · David Hasani · commit 1aadbf61bcf9 · 2025-05-20T15:28:23.000-07:00
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
@@ -423,7 +423,6 @@ class CodeTransformChatController(
         val transformCapabilities = listOf(EXPLAINABILITY_V1, CLIENT_SIDE_BUILD)
         codeModernizerManager.codeTransformationSession?.let {
             it.sessionContext.transformCapabilities = transformCapabilities
-            codeModernizerManager.runLocalMavenBuild(context.project, it)
         }
         promptForCustomYamlFile()
     }

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,6 @@ class CodeTransformChatController(`
`423`	`423`	`val transformCapabilities = listOf(EXPLAINABILITY_V1, CLIENT_SIDE_BUILD)`
`424`	`424`	`codeModernizerManager.codeTransformationSession?.let {`
`425`	`425`	`it.sessionContext.transformCapabilities = transformCapabilities`
`426`		`- codeModernizerManager.runLocalMavenBuild(context.project, it)`
`427`	`426`	`}`
`428`	`427`	`promptForCustomYamlFile()`
`429`	`428`	`}`