Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
fix dev to main conflicts #57
fix dev to main conflicts #57
Changes from all commits
b8576f2
dd74241
9837fcc
9015286
6b87eb8
745b569
c98612d
e93a9ad
ce0fe65
f04d8e7
5d8996b
3d60bb2
5a635c2
b504723
d63b9b6
058b515
1413566
8f19e34
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
These merge commits were added into this branch cleanly.
There are no new changes to show.