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
Fix merge conflicts & update branch #2
Fix merge conflicts & update branch #2
Changes from all commits
41e2a85
a01c081
77d21a6
f37fd71
279372b
4603ec3
a47fa63
804f215
88ded70
9b31f6c
6eb98a0
e7a1df7
c415c2b
14df740
d807997
611fca7
8ba2b4c
05b4c44
14bae32
f6e3e89
1ee7316
dce2f9b
875f99a
52620db
f2e4ee3
9a30e12
0d6b512
b4ed28a
12878ed
fcd1609
4cbd93b
e2894b6
85687e3
8db6590
af2c1a4
db45602
7269541
5474409
d97a224
fa9620f
c70d2c6
21aefcf
f17cc68
641145b
13a76b5
29d31cc
a9bd654
601c3a5
82685eb
336f3c9
9dcbd66
8275199
c136a4b
98376a7
4846c3a
176ddc8
a57a95f
2d0ffea
d0a7601
62efa25
5d9f30a
03d09c4
caecf9d
c0c5028
36febd6
9995232
8862038
c3b1d3c
ffcdfec
d3491f2
d51f2c5
d0d8c6e
9392294
dd963d1
3d093e7
e24fc76
e8b535d
36a527a
d0c6209
5ccafa5
737e52f
b21a5d4
2ae230e
e0d35af
b41a539
167e30c
ab6a059
d718402
8fa0588
81e798e
8a01bc9
512b8cb
d0f3e73
a1fa608
0ddbd64
e9ad61e
59cbb75
3ee7e48
c57f6e5
0db53e9
d2631fa
55e0f72
8053d93
7933fa4
bf1ccfa
c6760be
37e6a0d
85d9cad
17efb6a
5330729
3cb38a1
f57aa47
191c13f
fc892bc
d23a6d8
6da7de4
49e4117
97accd2
3ea8775
3c435b2
cb676ca
bac2653
7c2ad9c
1edb8ee
d31282f
e0b4f51
e0bdad2
f0ecae4
040debc
5475a2a
81d550a
c2c480a
d9b6f59
5a18ac5
7e40020
65a522a
302e299
24ca779
d08112e
adc17ef
c1fba80
6ba1f05
3e0ca74
77fc9d2
7669424
9244c81
f69fcd7
9ff893c
79c7918
4ab166a
943e18f
96550a2
c01ed86
b596856
90aa62a
4e3f9ac
02fc9ac
8138c06
0544f97
e4b9eb1
4c89ff7
f751e41
3708242
642fc79
5552dda
ada0bed
99b596e
d5558b2
2016799
44d4f45
8505b70
9284f4d
2ece8b0
73233ad
430cd28
cc7847e
821da83
d4ecfe0
0957d10
71214c3
1576e6c
a57dc76
5289177
3a63cd5
84a8634
0dcf1a6
b0e60fc
a999209
9ce1e26
2bf76d4
82c3b1c
1b24df9
4d47198
f9fbe6d
fe9210c
f13d034
4bd8f75
d086771
67f3c10
529110f
fb79c02
f9aca9a
b7dcaad
3b2ff66
dbe6a1d
7d06246
b75d339
2c69df3
18612a1
7cbc41e
8c71878
1f2e463
c97dd04
eb38045
bb08ce9
aff444d
e2d0662
585cb2e
a672a20
1dac999
56ae9e2
917ea0e
6acaa94
6f889c8
0ed470f
5e63dea
7705c73
0085f0a
d412e5f
60a7b51
e188dfe
f7fa099
7fcf444
3fac519
ca70d57
508aea9
d2048ce
9ef4114
0cdea25
683bbfa
92913a1
99c7406
2c5106f
5128175
2682f6a
51402fb
2a4bf4a
5e559da
08ae22e
a822fbf
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing