resolve merge conflict

manodnyab · manodnyab · commit 772a135faf34 · 2025-03-03T13:21:24.000-08:00
diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts
@@ -8,7 +8,7 @@ import software.aws.toolkits.gradle.intellij.IdeVersions
 plugins {
     id("toolkit-kotlin-conventions")
     id("toolkit-intellij-plugin")
-    id("org.jetbrains.intellij.platform.module")
+    id("org.jetbrains.intellij.platform")
 }
 
 val ideProfile = IdeVersions.ideProfile(project)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import software.aws.toolkits.gradle.intellij.IdeVersions`
`8`	`8`	`plugins {`
`9`	`9`	`id("toolkit-kotlin-conventions")`
`10`	`10`	`id("toolkit-intellij-plugin")`
`11`		`- id("org.jetbrains.intellij.platform.module")`
	`11`	`+ id("org.jetbrains.intellij.platform")`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`val ideProfile = IdeVersions.ideProfile(project)`