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.

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

Resolve merge conflicts #609

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Conversation

mfixstsci
Copy link
Contributor

f4b3d58 introduced files with commit merge messages in them, this PR Resolves this issue.

@mfixstsci
Copy link
Contributor Author

Merge before #608

Copy link
Member

@hover2pi hover2pi left a comment

Choose a reason for hiding this comment

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

Nice. Thanks Mees!

@hover2pi hover2pi merged commit 445935e into ExoCTK:develop Aug 1, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants