From 0e97d97d50708ff9c8cfac9d7e33534eb37a8f08 Mon Sep 17 00:00:00 2001 From: Jiaming Yuan Date: Wed, 16 Dec 2020 18:02:25 +0800 Subject: [PATCH] Fix merge conflict. (#6512) --- python-package/xgboost/core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-package/xgboost/core.py b/python-package/xgboost/core.py index c82cad227..cbf61d9ff 100644 --- a/python-package/xgboost/core.py +++ b/python-package/xgboost/core.py @@ -5,9 +5,8 @@ import collections # pylint: disable=no-name-in-module,import-error from collections.abc import Mapping -from typing import List, Optional, Any, Union +from typing import List, Optional, Any, Union, Dict # pylint: enable=no-name-in-module,import-error -from typing import Dict, Union, List import ctypes import os import re