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 conflicts #5
Resolve conflicts #5
Changes from all commits
70384d6
ea08dc3
ac124f7
62ca6bc
7861abf
5a21c22
8a54a1b
24ff9dc
04c2747
5de727f
ee90922
226f0fb
2523aef
e9983c1
4d468fc
c3a5aeb
a340ee6
1c1e191
85b0f1a
07978ef
097ef26
6f14033
b04d6fe
ea4d860
c00274b
9e89686
8a0d5e8
dbcb177
13956f6
389f65a
df31f71
253bdcc
6d424d2
6e60589
6b09896
30ec23a
5b301ef
17b4391
94973d4
b5766e5
4ef9710
b8e83b7
2b222f0
a3aab75
0ee1196
198c391
d93636d
e89446e
a7b5ffc
99f2912
d5daabd
b43f683
49c8796
f879282
70726ff
a3b71ae
5c4aa1c
59ed86b
a2dcce6
75283a8
dd62cbb
295c91a
054b32f
705c786
d4e7a76
ad4a25b
79a2f89
8da9161
2fcb308
3a67bb0
b398915
c428d24
c5df780
c675920
b54bcd7
2bc7639
c5e7ad0
7ae3fcb
86c23cd
a992be9
f6760f4
513dacf
bd1a356
42538f6
04ef57d
d262771
f54dabc
d3c8569
2bdeec4
c2d2af9
62e4a01
fddfbe5
c4b4995
9a910de
1ecfcfe
fa62590
5558fe5
06be59a
4e85157
8f2ff57
68b0387
c87b6dc
0fbb0fb
6e958f1
c35f001
cf9ac17
d6615ec
4d189c7
2efed3d
deecfd9
2bf3a10
a6318d2
191b386
3b4e320
0f2d248
04b320a
16021f6
0f7dba0
f200776
0aeb59c
a17accb
c3a3313
2333e5f
586dd76
9988afa
31570a8
fd540c0
e0f1278
1fadff2
7d805f5
856b0bd
6393de3
8a355a2
58bdbe8
dbcdde6
c8a5a5e
af66617
aa99a39
e0b6b35
d3ea36a
6efe5d9
ee633fb
68c0f25
7d5148e
7e86f4a
2e74757
312a660
0322b84
c267647
a8257e1
29a7a90
704bafa
b83197a
57bbabd
0082877
fa15222
8504d40
1056a62
452e47f
9e9ec3c
26ef112
49a51f9
efff3a3
42d95b6
6589290
f49d320
1181ae6
30be70f
b53d820
385c262
bfce8b2
f1093b6
0c95393
5e7fd38
c0e86b3
1f8fe9f
0f16980
12acac0
7ffe13a
50710b6
05e0080
28726aa
4a808fa
6a7ddc3
8f21ae9
40daa76
d40a9f0
b2ed508
32f09ce
aa1d65c
c99ad50
c2afda5
d14affb
5498b12
07a53a7
82c2dbc
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
This file was deleted.