remove conflicts

apache · Aug 17, 2016 · da3c549 · da3c549
1 parent da464f9
commit da3c549
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/R/pkg/R/mllib.R b/R/pkg/R/mllib.R
@@ -639,12 +639,10 @@ setMethod("write.ml", signature(object = "KMeansModel", path = "character"),
 
 #  Save fitted IsotonicRegressionModel to the input path
 
-#' @param path the directory where the model is saved.
-#' @param overwrite overwrites or not if the output path already exists. Default is FALSE
+#' @param path The directory where the model is saved
+#' @param overwrite Overwrites or not if the output path already exists. Default is FALSE
 #'                  which means throw exception if the output path exists.
 #'
-<<<<<<< 6a43d795dc073263b7b8880f744cbd895c257019
-<<<<<<< abe1aabdf9b9ce513f105482ed4c6d6143f2b0a4
 #' @rdname spark.isoreg
 #' @aliases write.ml,IsotonicRegressionModel,character-method
 #' @export

diff --git a/R/pkg/inst/tests/testthat/test_mllib.R b/R/pkg/inst/tests/testthat/test_mllib.R
@@ -476,7 +476,6 @@ test_that("spark.survreg", {
   }
 })
 
-<<<<<<< abe1aabdf9b9ce513f105482ed4c6d6143f2b0a4
 test_that("spark.isotonicRegression", {
   label <- c(7.0, 5.0, 3.0, 5.0, 1.0)
   feature <- c(0.0, 1.0, 2.0, 3.0, 4.0)