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

Merge main back into dev #766

Merged
merged 2 commits into from
Mar 17, 2023
Merged

Merge main back into dev #766

merged 2 commits into from
Mar 17, 2023

Conversation

Nils1729
Copy link
Contributor

This is required due to #750.

Greenscreen23 and others added 2 commits March 10, 2023 15:40
@Greenscreen23
Merge pull request #747 from hpi-sam/release/v0.2.0
4167831 
Release v0.2.0
@Nils1729
Hotfix/revert 740 cascade deletion of simulated regions (#750)
1006e8b 
* Revert "Fix deletion of simulated region now cascades (#740)"

This reverts commit 41e9cb3.

* Bump version to 0.2.1
@benn02 benn02 self-requested a review March 17, 2023 10:02
benn02
benn02 approved these changes Mar 17, 2023
View reviewed changes
Copy link
Contributor

@benn02 benn02 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to update this branch before merging it, and you need to reopen the issue that this revert reopens when this is done this LGTM

@Nils1729 Nils1729 merged commit e3b343a into dev Mar 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benn02 benn02 benn02 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Nils1729 @benn02 @Greenscreen23