Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict. (#6512)

Browse Source
This commit is contained in:
Jiaming Yuan 2020-12-16 18:02:25 +08:00 committed by GitHub
parent 749364f25d
commit 0e97d97d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python-package/xgboost/core.py
View File

@ -5,9 +5,8 @@
import collections import collections
# pylint: disable=no-name-in-module,import-error # pylint: disable=no-name-in-module,import-error
from collections.abc import Mapping 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 # pylint: enable=no-name-in-module,import-error
from typing import Dict, Union, List
import ctypes import ctypes
import os import os
import re import re