fix: resolve conflicts in order to be able to merge

lifewatch · Aug 16, 2023 · 6efebfa · 6efebfa
2 parents 1b5c0c9 + 073996c
commit 6efebfa
Show file tree

Hide file tree

Showing 9 changed files with 366 additions and 247 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pypam/acoustic_file.py b/pypam/acoustic_file.py
@@ -467,7 +467,7 @@ def _apply_multiple(self, method_list, binsize=None, band_list=None, bin_overlap
 
         # Bands selected to study
         if band_list is None:
-            band_list = [[None, self.fs / 2]]
+            band_list = [[0, self.fs / 2]]
 
         # Sort bands to diminish downsampling efforts!
         sorted_bands = []