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
solve conflicts #2
solve conflicts #2
Changes from 1 commit
028a445
47f509f
d8f12c2
68d7e6e
67c8f9f
ca23b91
db19c44
7dc1f7b
6a267b5
65b1ae0
67f0e96
11552ef
acfe7ef
ddb8ecc
d86fd43
223ae56
a002f73
f1e435e
60009cd
d1a3e1e
a5c40ff
f25a06b
62c96af
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing