Merge branch 'dev0'

4bf92aa1 · Nikolay Ivanov · 4f98d03f · f2c9ee7a · 4bf92aa1 · 4bf92aa1
Commit 4bf92aa1 authored 4 years ago by Nikolay Ivanov
--- a/.gitattributes
+++ b/.gitattributes
+dev.ipynb merge=ours
+dev.pyx merge=ours
+dev.pyxbld merge=ours
\ No newline at end of file
--- a/requirements.txt
+++ b/requirements.txt
 Cython==0.29.21
-CythonGSL==0.2.3
+CythonGSL==0.2.2
 h5py==2.10.0
 numpy==1.19.1
 scipy==1.5.2