Skip to content

Commit

Permalink
BUG: fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jklenzing committed Jun 6, 2023
1 parent 1aea5e9 commit 78ad434
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions pysatNASA/instruments/methods/jhuapl.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ def load_edr_aurora(fnames, tag='', inst_id='', pandas_format=False,
sdata, mdata = load_netcdf(fname, epoch_name='TIME', epoch_unit='s',
meta_kwargs={'labels': labels},
pandas_format=pandas_format,
labels=labels, pandas_format=pandas_format,
strict_dim_check=strict_dim_check)

# Calculate the time for this data file. The pysat `load_netcdf` routine
Expand Down Expand Up @@ -239,7 +238,6 @@ def load_sdr_aurora(fnames, tag='', inst_id='', pandas_format=False,
sdata, mdata = load_netcdf(fname, epoch_name=load_time, epoch_unit='s',
meta_kwargs={'labels': labels},
pandas_format=pandas_format,
labels=labels, pandas_format=pandas_format,
strict_dim_check=strict_dim_check)

# Calculate the time for this data file. The pysat `load_netcdf` routine
Expand Down

0 comments on commit 78ad434

Please sign in to comment.