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

Existing prs #62

Merged
merged 3 commits into from
Nov 30, 2023
Merged

Existing prs #62

merged 3 commits into from
Nov 30, 2023

Conversation

dyldonahue
Copy link
Contributor

Rather than have people fix insane amounts of merge conflicts after i fixed shepehrd to get it to build, we deciede to just manually move them here

@dyldonahue dyldonahue requested a review from nwdepatie November 19, 2023 22:56
@dyldonahue dyldonahue changed the base branch from main to develop/features November 30, 2023 01:53
nwdepatie
nwdepatie approved these changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@nwdepatie nwdepatie left a comment

Choose a reason for hiding this comment

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

Looks okay to me, definitely need to see if it can run on hardware tho

@dyldonahue dyldonahue merged commit 9e523cc into develop/features Nov 30, 2023
1 check passed
@dyldonahue dyldonahue deleted the existing-prs branch November 30, 2023 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nwdepatie nwdepatie nwdepatie 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.
2 participants
@dyldonahue @nwdepatie