Resolv conflict

apache · Sep 3, 2015 · 7d693c2 · 7d693c2
2 parents 62010af + 40d3027
commit 7d693c2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/source/libsvm/LibSVMRelation.scala b/mllib/src/main/scala/org/apache/spark/ml/source/libsvm/LibSVMRelation.scala
@@ -44,6 +44,7 @@ private[ml] class LibSVMRelation(val path: String, val numFeatures: Int, val vec
       StructField("features", new VectorUDT(), nullable = false) :: Nil
   )
 
+<<<<<<< HEAD
   override def buildScan(): RDD[Row] = {
     val sc = sqlContext.sparkContext
     val baseRdd = MLUtils.loadLibSVMFile(sc, path, numFeatures)