fixed merge conflict in readme

README.md

@@ -36,10 +36,9 @@ devtools::install_github("mlr3learners/mlr3learners.lightgbm")
 ```r
 library(mlr3)
 task = mlr3::tsk("iris")
-<<<<<<< HEAD
 learner = mlr3::lrn("classif.lightgbm", objective = "multiclass")
 
-learner$param_set$values <- mlr3misc::insert_named(
+learner$param_set$values = mlr3misc::insert_named(
   learner$param_set$values,
     list(
     "early_stopping_round" = 10,
@@ -49,17 +48,6 @@ learner$param_set$values <- mlr3misc::insert_named(
     "num_iterations" = 100,
     "num_class" = 3
   )
-=======
-learner = mlr3::lrn("classif.lightgbm")
-
-learner$early_stopping_rounds = 1000
-learner$num_boost_round = 5000
-
-learner$param_set$values = list(
-  "objective" = "multiclass",
-  "learning_rate" = 0.01,
-  "seed" = 17L
->>>>>>> development
 )
 
 learner$train(task, row_ids = 1:120)
@@ -84,8 +72,7 @@ Rscript build_r.R
 In order to use the GPU acceleration, the parameter `device_type = "gpu"` (default: "cpu") needs to be set. According to the [LightGBM parameter manual](https://lightgbm.readthedocs.io/en/latest/Parameters.html), 'it is recommended to use the smaller `max_bin` (e.g. 63) to get the better speed up'. 
 
 ```r
-<<<<<<< HEAD
-learner$param_set$values <- mlr3misc::insert_named(
+learner$param_set$values = mlr3misc::insert_named(
   learner$param_set$values,
     list(
       "objective" = "multiclass",
@@ -99,15 +86,6 @@ learner$param_set$values <- mlr3misc::insert_named(
       "num_class" = 3
       )
   )
-=======
-learner$param_set$values = list(
-  "objective" = "multiclass",
-  "learning_rate" = 0.01,
-  "seed" = 17L,
-  "device_type" = "gpu",
-  "max_bin" = 63L
-)
->>>>>>> development
 ```
 
 All other steps are similar to the workflow without GPU support.