Github user felixcheung commented on a diff in the pull request:

    https://github.com/apache/spark/pull/18281#discussion_r134123840
  
    --- Diff: 
mllib/src/main/scala/org/apache/spark/ml/classification/OneVsRest.scala ---
    @@ -17,29 +17,34 @@
     
     package org.apache.spark.ml.classification
     
    -import java.util.{List => JList}
     import java.util.UUID
     
    -import scala.collection.JavaConverters._
    +import scala.concurrent.Future
    +import scala.concurrent.duration.Duration
     import scala.language.existentials
     
     import org.apache.hadoop.fs.Path
     import org.json4s.{DefaultFormats, JObject, _}
     import org.json4s.JsonDSL._
     import org.json4s.jackson.JsonMethods._
     
    -import org.apache.spark.SparkContext
     import org.apache.spark.annotation.Since
     import org.apache.spark.ml._
     import org.apache.spark.ml.attribute._
     import org.apache.spark.ml.linalg.Vector
     import org.apache.spark.ml.param.{Param, ParamMap, ParamPair, Params}
    +<<<<<<< HEAD
    --- End diff --
    
    some sort of merge problem? this shouldn't be in a commit


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to