Skip to content

Commit

Permalink
fix incorrect merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyCBakerPhD authored Jul 27, 2022
1 parent ec0fd77 commit d34c281
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,9 @@

### Testing

# v0.4.17


# v0.4.18

### Improvements
* `get_video` is now an abstract method in `ImagingExtractor` [PR #180](https://github.com/catalystneuro/roiextractors/pull/180)

0 comments on commit d34c281

Please sign in to comment.