resolve conflict

apache · hhbyyh · Mar 1, 2017 · Mar 2, 2017 · Mar 11, 2017 · Mar 10, 2017
commit 9e908d0d88ce15781b7de87f4e24c6b8ba9dc2a4
diff --git a/mllib/src/main/scala/org/apache/spark/ml/fpm/FPGrowth.scala b/mllib/src/main/scala/org/apache/spark/ml/fpm/FPGrowth.scala
@@ -68,8 +68,8 @@ private[fpm] trait FPGrowthParams extends Params with HasPredictionCol {
   def getMinSupport: Double = $(minSupport)
 
   /**
-   * Number of partitions ( &gt;= 1) used by parallel FP-growth. By default the param is not set,
-   * and partition number of the input dataset is used.
+   * Number of partitions (at least 1) used by parallel FP-growth. By default the param is not
+   * set, and partition number of the input dataset is used.
    * @group expertParam
    */
   @Since("2.2.0")