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 resolution #470
Conflict resolution #470
Changes from all commits
6186dad
70e0bda
850618c
67f0a17
528b712
b079d4c
bd15017
378fd02
e686fb8
93dcc97
5fd0dde
8999f24
f6cc933
7483c23
acef550
5bc0c8e
9065719
122c3bb
cff35c2
b2a3650
598f64f
63f58c5
8565ded
1ebdae6
51dd29e
5a43aa0
88decef
be56cca
5906cea
b11a2d6
8190fdc
7a452b0
c7e03df
62906dc
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing