Skip to content

Commit

Permalink
Remove merge conflict-resolution change
Browse files Browse the repository at this point in the history
  • Loading branch information
kushalbakshi committed Nov 1, 2024
1 parent a3f353a commit 3e401f1
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions element_array_ephys/ephys_acute.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@ def auto_generate_entries(cls, session_key):
"probe_type": spikeglx_meta.probe_model,
"probe": spikeglx_meta.probe_SN,
}
if (
probe_key["probe"] not in [p["probe"] for p in probe_list]
and probe_key not in probe.Probe()
):
if probe_key["probe"] not in [p["probe"] for p in probe_list]:
probe_list.append(probe_key)

probe_dir = meta_filepath.parent
Expand All @@ -207,10 +204,7 @@ def auto_generate_entries(cls, session_key):
"probe_type": oe_probe.probe_model,
"probe": oe_probe.probe_SN,
}
if (
probe_key["probe"] not in [p["probe"] for p in probe_list]
and probe_key not in probe.Probe()
):
if probe_key["probe"] not in [p["probe"] for p in probe_list]:
probe_list.append(probe_key)
probe_insertion_list.append(
{
Expand Down

0 comments on commit 3e401f1

Please sign in to comment.