Skip to content

Conversation

@FWuellhorst
Copy link
Contributor

@FWuellhorst FWuellhorst commented May 23, 2024

@mwetter This commit fixes the merge issues on our CI and works locally just as before.

Closes #554

@mwetter mwetter changed the base branch from master to 554_join_error May 23, 2024 14:00
@mwetter
Copy link
Member

mwetter commented May 23, 2024

@FWuellhorst : thanks, I will merge it to the master after it run through the CI tests.

@mwetter mwetter merged commit 2eb9963 into lbl-srg:554_join_error May 23, 2024
mwetter added a commit that referenced this pull request May 23, 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.

Bug in ibpsa merge script

2 participants