Skip to content

Commit 0467d72

Browse files
committed
fix bad merge conflict fix
1 parent 4d92daa commit 0467d72

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

neo/rawio/intanrawio.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def _parse_header(self):
149149
self._raw_data[stream_index].append(
150150
np.memmap(
151151
raw_file_paths_dict[stream_index_key][channel_index],
152-
dtype=[channel_datatype],
152+
dtype=channel_datatype,
153153
mode="r",
154154
)
155155
)
@@ -254,8 +254,6 @@ def _get_signal_size(self, block_index, seg_index, stream_index):
254254
else:
255255
size = self._raw_data[stream_index][0].size
256256

257-
size = self._raw_data[channel_id_0].size
258-
259257
return size
260258

261259
def _get_signal_t_start(self, block_index, seg_index, stream_index):

0 commit comments

Comments
 (0)