Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #1098 #1100

Merged
merged 2 commits into from
Sep 11, 2024
Merged

Fix #1098 #1100

merged 2 commits into from
Sep 11, 2024

Conversation

CBroz1
Copy link
Member

@CBroz1 CBroz1 commented Sep 10, 2024 •
edited
Loading

Description

As described in #1098, concurrent PRs overwrote feature adds in #973. This PR adds those edits back in the current structure.

Checklist:

  • No. This PR should be accompanied by a release: (yes/no/unsure)
  • N/a. If release, I have updated the CITATION.cff
  • No. This PR makes edits to table definitions: (yes/no)
  • N/a. If table edits, I have included an alter snippet for release notes.
  • If this PR makes changes to position, I ran the relevant tests locally.
  • I have updated the CHANGELOG.md with PR number and description.
  • No. I have added/edited docs/notebooks to reflect the changes

@CBroz1 CBroz1 marked this pull request as ready for review September 10, 2024 20:03
@edeno edeno requested a review from samuelbray32 September 10, 2024 23:26
samuelbray32
samuelbray32 approved these changes Sep 11, 2024
View reviewed changes
Copy link
Collaborator

@samuelbray32 samuelbray32 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @CBroz1

@edeno edeno merged commit a7b13fa into LorenFrankLab:master Sep 11, 2024
7 checks passed
@CBroz1 CBroz1 deleted the 1098 branch October 22, 2024 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samuelbray32 samuelbray32 samuelbray32 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@CBroz1 @samuelbray32 @edeno