Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodyCBakerPhD
CodyCBakerPhD committed Aug 30, 2024
1 parent b8abd4f commit 7591055
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# leifer_lab_to_nwb

<<<<<<< HEAD
Conversion scripts for the Leifer lab.
=======
Conversion scripts and command line utilities for converting data from the Leifer lab PumpProbe system to NeurodataWithoutBorders (NWB) format.
>>>>>>> main

Includes the publication Neural signal propagation atlas of Caenorhabditis elegans (Nature, 2023).

Expand Down

0 comments on commit 7591055

Please sign in to comment.