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 conflict with result files #1034

Merged
merged 2 commits into from
Jun 12, 2021
Merged

Resolve conflict with result files #1034

merged 2 commits into from
Jun 12, 2021

Conversation

lochel
Copy link
Member

@lochel lochel commented Jun 12, 2021

... to make jenkins happy

@lochel lochel enabled auto-merge (squash) June 12, 2021 10:37
@lochel lochel merged commit 5e43ab6 into OpenModelica:master Jun 12, 2021
@lochel lochel deleted the res branch June 12, 2021 11:00
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.

1 participant