Resolving code conflicts

apache · Aug 3, 2023 · ee19f6a · ee19f6a
1 parent 1587057
commit ee19f6a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala b/...-core/src/main/scala/org/apache/linkis/engineconnplugin/flink/operator/KillOperator.scala
@@ -31,6 +31,7 @@ import org.apache.hadoop.yarn.api.records.{ApplicationId, FinalApplicationStatus
 
 import java.util
 
+import scala.collection.JavaConverters.collectionAsScalaIterableConverter
 import scala.collection.mutable
 
 class KillOperator extends Operator with Logging {