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 merge conflict #1359

Merged
merged 1 commit into from Apr 23, 2020
Merged

fix merge conflict #1359

merged 1 commit into from Apr 23, 2020

Conversation

swryan
Copy link
Contributor

@swryan swryan commented Apr 23, 2020

Summary

fix merge conflict between #1343 and #1355

Related Issues

  • Resolves #

Backwards incompatibilities

None

New Dependencies

None

@project-bot project-bot bot added this to In progress in OpenMDAO Dev [Read only] Apr 23, 2020
OpenMDAO Dev [Read only] automation moved this from In progress to Reviewer approved Apr 23, 2020
@swryan swryan merged commit b3111b1 into OpenMDAO:master Apr 23, 2020
OpenMDAO Dev [Read only] automation moved this from Reviewer approved to Done Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@naylor-b naylor-b naylor-b approved these changes

@Kenneth-T-Moore Kenneth-T-Moore Kenneth-T-Moore approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
OpenMDAO Dev [Read only]
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@swryan @naylor-b @Kenneth-T-Moore