diff options
Diffstat (limited to 'pyspike/__init__.py')
| -rw-r--r-- | pyspike/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyspike/__init__.py b/pyspike/__init__.py index 6651eb5..6895bd8 100644 --- a/pyspike/__init__.py +++ b/pyspike/__init__.py @@ -2,4 +2,4 @@ __all__ = ["function", "distances", "spikes"] from function import PieceWiseConstFunc from distances import isi_distance -from spikes import spike_train_from_string +from spikes import spike_train_from_string, merge_spike_trains |