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
resolve merge conflicts #2
resolve merge conflicts #2
Changes from all commits
a7f00f9
4328ce5
e05566a
98836f5
41cbda7
fc8a4af
18f867a
feaa44c
3b5838e
248cbf2
3647d2a
6679817
18a7501
bfd9f7d
ce7c07e
0f6216d
12badad
a0998a6
7188d59
11764db
4ed3555
1805f4d
9d1af3f
8a017b7
12304bb
5f62e10
c6bc53d
f8b7656
a350db1
9180d06
2d86d16
c498c81
512de41
2d0bc72
2c75d55
8cd744f
2f83343
67acd6f
0bb00c4
32673d5
889b195
4b1c4ed
5713a93
4db1ddd
0be480f
a8f6c37
9073f19
44d9ff7
2f703ad
cf06d43
fe9a3f7
f6cddcd
c41b7a8
ff82416
52123b8
a94ab5d
628729d
eed7f3b
d1bde9b
4b45f9b
13cf320
cdfcb15
143cb15
0fbe29f
a15c4d4
9d77032
d3b1940
465a316
23dca8e
edf8be5
86cbae7
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing