Merge remote-tracking branch 'origin/API_recomp' into API_recomp

2AUK · Jun 1, 2023 · 4ad06ed · 4ad06ed
2 parents 789f277 + 12583e3
commit 4ad06ed
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 84 deletions.
diff --git a/pyrism/IntegralEquations/XRISM_UV.py b/pyrism/IntegralEquations/XRISM_UV.py
diff --git a/pyrism/IntegralEquations/XRISM_impl.py b/pyrism/IntegralEquations/XRISM_impl.py
diff --git a/pyrism/IntegralEquations/__init__.py b/pyrism/IntegralEquations/__init__.py
@@ -1 +1 @@
-from .IE import IntegralEquation
+from .IE import *
diff --git a/pyrism/Potentials/#mixing.py# b/pyrism/Potentials/#mixing.py#
diff --git a/pyrism/Potentials/.#mixing.py b/pyrism/Potentials/.#mixing.py