Fix merge conflict. (#6512)

2020-12-16 18:02:25 +08:00 · 2020-12-16 18:02:25 +08:00 · 0e97d97d50
commit 0e97d97d50
parent 749364f25d
1 changed files with 1 additions and 2 deletions
--- 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