Fix merge conflict. (#6512)

This commit is contained in:
Jiaming Yuan
2020-12-16 18:02:25 +08:00
committed by GitHub
parent 749364f25d
commit 0e97d97d50

View File

@@ -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