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
conflict #22
conflict #22
Changes from all commits
6a335e3
dc627e7
00a602b
203d234
c5cb029
1b23aa2
a8bae64
15772ba
7f66828
d2289e6
5a98032
df52b94
ddf0c1f
44ed4bd
eb0ab3c
5b20380
65eff6d
f1baec3
a9a1d80
dfcd63f
be28eb3
ddd8301
8857e8a
1195f5a
091594e
5a1b8ce
c8ae5c6
923ddb7
f985b47
690517a
7fbbaef
a8db751
6d768d1
3a2441d
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
This file was deleted.