Skip to content

Conversation

@H0R5E
Copy link
Contributor

@H0R5E H0R5E commented Jul 13, 2021

This PR resolves the merge conflict in #621.

Diagram authored by @rakkarolina.

Rak and others added 3 commits July 13, 2021 12:47
@H0R5E H0R5E merged commit 6785ed0 into WEC-Sim:dev Jul 13, 2021
@H0R5E H0R5E deleted the oswec_diagram branch July 13, 2021 11:59
@akeeste akeeste added the Documentation related to docs label Jul 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation related to docs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants