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

Pull bug fixes #1330 and #1342 into dev #1348

Closed
wants to merge 2 commits into from
Closed

Pull bug fixes #1330 and #1342 into dev #1348

wants to merge 2 commits into from

Conversation

akeeste
Copy link
Contributor

@akeeste akeeste commented Oct 30, 2024

Pull bug fixes #1330 and #1342 into dev

jleonqu and others added 2 commits October 5, 2024 11:30
* Fixing documentation inconsistency for PTO-Sim blocks

* Adding comments to nondimensional values for clarification
@akeeste akeeste mentioned this pull request Oct 30, 2024
4 tasks
@kmruehl
Copy link
Contributor

kmruehl commented Oct 30, 2024

@akeeste #1330 should already be in dev, but I'll review this PR to confirm

@kmruehl kmruehl self-requested a review October 30, 2024 15:53
@kmruehl kmruehl self-assigned this Oct 30, 2024
@akeeste
Copy link
Contributor Author

akeeste commented Oct 30, 2024

@kmruehl we should briefly enable non-squashed merges for this PR

@akeeste
Copy link
Contributor Author

akeeste commented Oct 30, 2024

@kmruehl agreed, I missed that. Looks like #1341 pulled both these commits into dev and I see them there. Maybe we squashed that PR and that's why it looks like we're still bringing them in?

My bad here, I thought we needed this but do not per #1341. Let's close this without merging

@akeeste akeeste closed this Oct 30, 2024
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.

3 participants