Regenerate rerquirements.

Author: twiecki

requirements-dev.txt

@@ -2,18 +2,14 @@
 # See that file for comments about the need/usage of each dependency.
 
 aesara>=2.1.0
-<<<<<<< HEAD
-arviz>=0.11.4
-cachetools>=4.2.1
-=======
 arviz>=0.11.2
 cachetools
->>>>>>> Remove libblas, mkl and m2w64-toolchain dependencies. As PyMC3 itself does not compile anything, it should not have these dependencies. Instead, it is aesaras job to specify its compile-chain dependencies. Closes #4715.
 cloudpickle
 fastprogress>=0.2.0
 h5py>=2.7
 ipython>=7.16
 myst-nb
+nbsphinx>=0.4
 numpy>=1.15.0
 numpydoc>=0.9
 pandas
@@ -24,8 +20,6 @@ pytest>=3.0
 recommonmark>=0.4
 scipy>1.4.1
 sphinx-autobuild>=0.7
-sphinx-design
-sphinx-notfound-page
 sphinx-panels
 sphinx>=1.5
 typing-extensions>=3.7.4