merge error

samgst-amazon · samgst-amazon · commit f3f6f6f8b98d · 2025-05-09T11:24:38.000-07:00
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
@@ -391,8 +391,4 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
     companion object {
         private val LOG = getLogger<AmazonQLanguageClientImpl>()
     }
-
-    companion object {
-        private val LOG = getLogger<AmazonQLanguageClientImpl>()
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,4 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC`
`391`	`391`	`companion object {`
`392`	`392`	`private val LOG = getLogger<AmazonQLanguageClientImpl>()`
`393`	`393`	`}`
`394`		`-`
`395`		`- companion object {`
`396`		`- private val LOG = getLogger<AmazonQLanguageClientImpl>()`
`397`		`- }`
`398`	`394`	`}`