From 486555eb3e54ad640a6b067784a9a668897805aa Mon Sep 17 00:00:00 2001
From: Jiao Dong <jiaodong@anyscale.com>
Date: Fri, 30 Jul 2021 10:25:04 -0700
Subject: [PATCH] merge conflict

---
 doc/source/xgboost-ray.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/source/xgboost-ray.rst b/doc/source/xgboost-ray.rst
index ca3a1ea0cf9b6..94cbf8c801ef7 100644
--- a/doc/source/xgboost-ray.rst
+++ b/doc/source/xgboost-ray.rst
@@ -104,8 +104,6 @@ Here is a simplified example (which requires ``sklearn``\ ):
 
    print(pred_ray)
 
-<<<<<<< HEAD
-=======
 scikit-learn API
 ^^^^^^^^^^^^^^^^
 
@@ -185,7 +183,6 @@ Things to keep in mind:
 
 For more information on the scikit-learn API, refer to the `XGBoost documentation <https://xgboost.readthedocs.io/en/latest/python/python_api.html#module-xgboost.sklearn>`_.
 
->>>>>>> 2ce73ce84 ([docs] Revert #16919 and fix documentation build (#17270))
 Data loading
 ------------
 
@@ -610,8 +607,6 @@ API reference
 .. autofunction:: xgboost_ray.train
 
 .. autofunction:: xgboost_ray.predict
-<<<<<<< HEAD
-=======
 
 scikit-learn API
 ^^^^^^^^^^^^^^^^
@@ -627,4 +622,3 @@ scikit-learn API
 
 .. .. autoclass:: xgboost_ray.RayXGBRFRegressor
 ..     :members:
->>>>>>> 2ce73ce84 ([docs] Revert #16919 and fix documentation build (#17270))