From 2020ac1d2c47f63a4d7b0a6f91e5e6971cb209d6 Mon Sep 17 00:00:00 2001
From: "Erin (Josh) Rigler" <erigler@igskcicgltgm017.cr.usgs.gov>
Date: Wed, 22 Aug 2018 16:04:44 -0600
Subject: [PATCH] Fix typo in previous commit

---
 geomagio/TimeseriesUtility.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geomagio/TimeseriesUtility.py b/geomagio/TimeseriesUtility.py
index e82ab8d7..4f0adeb1 100644
--- a/geomagio/TimeseriesUtility.py
+++ b/geomagio/TimeseriesUtility.py
@@ -225,7 +225,7 @@ def merge_streams(*streams):
             # 1 = when there is overlap, use data from trace with last endtime
             method=1,
             # np.nan = work-around for (problematic) intermediate masked arrays
-            filled_value=numpy.nan)
+            fill_value=numpy.nan)
 
     # convert back to NaN filled array
     merged = unmask_stream(split)
-- 
GitLab