fixed conflict

Author: hephaex

vendor/ngc-pytorch/requirements.22.02.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 GitPython==3.1.26
 Jinja2==2.11.2
 Markdown==3.3.6
@@ -6,19 +7,56 @@ PySocks==1.7.1
 SoundFile==0.10.3.post1
 Sphinx==4.4.0
 #Werkzeug==2.0.3
+=======
+EasyProcess==0.3
+Fiona==1.8.6
+GitPython==3.1.26
+JPype1==0.7.2
+Jinja2==2.11.2
+LunarCalendar>=0.0.9
+Mako==1.0.7
+Markdown==3.3.6
+MarkupSafe==2.1.1
+Pillow==9.1.0
+PyQt5-sip==12.8.1
+PySocks==1.7.1
+PyVirtualDisplay==1.3.2
+PyWavelets==1.1.1
+PythonWebHDFS==0.2.3
+QtPy==1.9.0
+Shapely==1.7.0
+SoundFile==0.10.3.post1
+Sphinx==4.4.0
+Werkzeug==2.0.3
+adanet==0.9.0
+aiohttp==3.8.0
+aiozmq==0.9.0
+albumentations==1.1.0
+>>>>>>> 7f49336ecc9b4df711c536ebd8d5ba5302ec8b9d
 alembic==1.7.6
 anyio==3.4.0
 argo_workflows==3.6.0
 asgiref==3.4.1
+<<<<<<< HEAD
 black==21.11b1
 #certifi==2021.10.8
+=======
+astor==0.8.1
+black==21.11b1
+certifi==2021.10.8
+>>>>>>> 7f49336ecc9b4df711c536ebd8d5ba5302ec8b9d
 certipy==0.1.2
 #entrypoints==0.4
 flake8==4.0.0
 fonttools==4.32.0
 gitdb==4.0.5
+<<<<<<< HEAD
 #importlib_resources==5.7.1
 jsonschema==4.4.0
+=======
+importlib_resources==5.7.1
+#jsonschema==4.4.0
+>>>>>>> 7f49336ecc9b4df711c536ebd8d5ba5302ec8b9d
 jupyter_client==6.1.11
 jupyter_server==1.15.5
 jupyter_server_mathjax==0.2.4
@@ -44,7 +82,7 @@ nltk==3.3.0
 nose==1.3.3
 notebook==6.4.10
 oauthenticator==0.12.1
-oauthlib==3.2.0
+#oauthlib==3.2.0
 opencv_python_headless==4.5.5.62
 packaging==21.2
 pandas==1.4.2
@@ -55,6 +93,7 @@ pexpect==4.8.0
 prometheus-client==0.13.1
 prompt_toolkit==3.0.17
 psutil==5.9.0
+<<<<<<< HEAD
 EasyProcess==0.3
 Fiona==1.8.6
 JPype1==0.7.2
@@ -76,6 +115,8 @@ aiohttp==3.8.0
 aiozmq==0.9.0
 albumentations==1.1.0
 astor==0.8.1
+=======
+>>>>>>> 7f49336ecc9b4df711c536ebd8d5ba5302ec8b9d
 astroid==2.11.2
 async-timeout==4.0.0
 atlas==0.27.0