fixed conflicts

Author: hephaex

vendor/ngc-pytorch/requirements.22.02.txt

@@ -1,3 +1,36 @@
+pandocfilters==1.5.0
+psutil==5.9.0
+importlib_resources==5.7.1
+matplotlib==3.5.1
+PySocks==1.7.1
+Markdown==3.3.6
+entrypoints==0.4
+Sphinx==4.4.0
+matplotlib_inline==0.1.3
+pexpect==4.8.0
+jsonschema==4.4.0
+pathspec==0.9.0
+partd==1.2.0
+certifi==2021.10.8
+psutil==5.9.0
+pandocfilters==1.5.0
+oauthlib==3.2.0
+importlib_resources==5.7.1
+pexpect==4.8.0
+Sphinx==4.4.0
+matplotlib_inline==0.1.3
+matplotlib==3.5.1
+jsonschema==4.4.0
+certifi==2021.10.8
+pathspec==0.9.0
+Markdown==3.3.6
+entrypoints==0.4
+PySocks==1.7.1
+Werkzeug==2.0.3
+partd==1.2.0
+importlib_resources==5.7.1
+pandocfilters==1.5.0
+pexpect==4.8.0
 certifi==2021.10.8
 prometheus-client==0.13.1
 matplotlib_inline==0.1.3