resolve conflicts

apache · Apr 7, 2016 · 21f8be5 · 21f8be5
1 parent 5f093e6
commit 21f8be5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/fpm/PrefixSpan.scala b/mllib/src/main/scala/org/apache/spark/mllib/fpm/PrefixSpan.scala
@@ -36,9 +36,8 @@ import org.apache.spark.api.java.JavaSparkContext.fakeClassTag
 import org.apache.spark.internal.Logging
 import org.apache.spark.mllib.util.{Loader, Saveable}
 import org.apache.spark.rdd.RDD
+import org.apache.spark.sql.{DataFrame, Row, SQLContext}
 import org.apache.spark.sql.catalyst.ScalaReflection
-import org.apache.spark.sql.{DataFrame, Row}
-import org.apache.spark.sql.SQLContext
 import org.apache.spark.sql.types._
 import org.apache.spark.storage.StorageLevel