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

Fixed merge conflict mistake. Fixed init test #54

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Fixed merge conflict mistake. Fixed init test #54

merged 2 commits into from
Jun 8, 2021

Conversation

HagenSR
Copy link
Owner

@HagenSR HagenSR commented Jun 6, 2021

  • Fixed merge conflict error in enums
  • Fixed init test

erickbickler
erickbickler approved these changes Jun 6, 2021
View reviewed changes
Copy link
Collaborator

@erickbickler erickbickler left a comment

Choose a reason for hiding this comment

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

Looks good

@amanda-f-ndsu amanda-f-ndsu self-requested a review June 7, 2021 02:23
amanda-f-ndsu
amanda-f-ndsu requested changes Jun 7, 2021
View reviewed changes
Copy link
Collaborator

@amanda-f-ndsu amanda-f-ndsu left a comment

Choose a reason for hiding this comment

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

Fix merge conflicts with dev, otherwise, it's looking good.

@erickbickler erickbickler linked an issue Jun 7, 2021 that may be closed by this pull request
Add validation to moving_object constructor #26
Closed
@erickbickler erickbickler mentioned this pull request Jun 7, 2021
Closed
@HagenSR HagenSR merged commit dfe3a7d into dev Jun 8, 2021
@HagenSR HagenSR deleted the FixInitTest branch June 8, 2021 01:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amanda-f-ndsu amanda-f-ndsu amanda-f-ndsu requested changes

@erickbickler erickbickler erickbickler 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.

Add validation to moving_object constructor
3 participants
@HagenSR @erickbickler @amanda-f-ndsu