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

chore: main -> dev #229

Merged
merged 14 commits into from Mar 21, 2024
Merged

chore: main -> dev #229

merged 14 commits into from Mar 21, 2024

Conversation

joshuagraber
Copy link
Contributor

Resolving conflicts in the client on dev (resulting from multiple PRs merging directly to main) before any in-progress work makes them worse 😅

@joshuagraber
Copy link
Contributor Author

@mbodeantor Are you okay if I merge this? Just an update of dev with latest changes from main, to resolve conflicted files.

@mbodeantor mbodeantor merged commit 54287a8 into dev Mar 21, 2024
8 checks passed
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.

None yet

2 participants