try to resolve conflicts

This commit is contained in:
dobefore 2022-02-05 14:30:58 +08:00 committed by Vikash Kothary
parent cf7d0144b8
commit 30bc574d8d
2 changed files with 18 additions and 15 deletions

View File

@ -2,18 +2,21 @@
anki==2.1.46; python_version >= "3.8" anki==2.1.46; python_version >= "3.8"
appnope==0.1.2; platform_system == "Darwin" and python_version >= "3.7" and sys_platform == "darwin" appnope==0.1.2; platform_system == "Darwin" and python_version >= "3.8" and sys_platform == "darwin"
argon2-cffi==20.1.0; python_version >= "3.5" argon2-cffi-bindings==21.2.0; python_version >= "3.6"
async-generator==1.10; python_version >= "3.6" argon2-cffi==21.3.0; python_version >= "3.6"
attrs==20.3.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" asttokens==2.0.5; python_version >= "3.8"
backcall==0.2.0; python_version >= "3.7" attrs==21.4.0; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
beautifulsoup4==4.9.3 backcall==0.2.0; python_version >= "3.8"
bleach==3.3.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" beautifulsoup4==4.10.0; python_full_version > "3.0.0"
certifi==2020.12.5; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.8" black==21.12b0; python_full_version >= "3.6.2" and python_version >= "3.8"
cffi==1.14.4; implementation_name == "pypy" and python_version >= "3.6" bleach==4.1.0; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
chardet==4.0.0; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.8" certifi==2021.10.8; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.8"
click==7.1.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" cffi==1.15.0; implementation_name == "pypy" and python_version >= "3.7" and python_full_version >= "3.6.1"
colorama==0.4.4; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.5.0" charset-normalizer==2.0.10; python_full_version >= "3.6.0" and python_version >= "3.8"
click==8.0.3; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.8"
colorama==0.4.4; python_version >= "3.8" and python_full_version < "3.0.0" and platform_system == "Windows" and sys_platform == "win32" or platform_system == "Windows" and python_version >= "3.8" and python_full_version >= "3.5.0" and sys_platform == "win32"
debugpy==1.5.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7"
decorator==4.4.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.2.0") decorator==4.4.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.2.0")
defusedxml==0.7.1; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7" defusedxml==0.7.1; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
distro==1.6.0 distro==1.6.0

View File

@ -2,9 +2,9 @@
anki==2.1.46; python_version >= "3.8" anki==2.1.46; python_version >= "3.8"
beautifulsoup4==4.9.3 beautifulsoup4==4.10.0; python_full_version > "3.0.0"
certifi==2020.12.5; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.8" certifi==2021.10.8; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.8"
chardet==4.0.0; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.8" charset-normalizer==2.0.10; python_full_version >= "3.6.0" and python_version >= "3.8"
decorator==4.4.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.2.0") decorator==4.4.2; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.2.0")
distro==1.6.0 distro==1.6.0
idna==3.3; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.8" idna==3.3; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.8"