Merge f098b40 into 064b993

LFPy · Oct 6, 2020 · 2746624 · 2746624
2 parents 064b993 + f098b40
commit 2746624
Show file tree

Hide file tree

Showing 4 changed files with 428 additions and 6 deletions.
diff --git a/LFPy/__init__.py b/LFPy/__init__.py
@@ -65,8 +65,7 @@
 from .templatecell import TemplateCell
 from .network import NetworkCell, NetworkPopulation, Network
 from .test import _test as run_tests
-from lfpykit.eegmegcalc import FourSphereVolumeConductor, \
-    InfiniteVolumeConductor, MEG
+from .eegmegcalc import FourSphereVolumeConductor, InfiniteVolumeConductor, MEG
 from lfpykit import lfpcalc
 from . import tools
 from . import inputgenerators