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
cope with conflicts #3
cope with conflicts #3
Changes from all commits
aab5871
8ad154b
795c70a
73becce
9b1f78c
6fb53fd
e1a9cfa
a9b324c
3d107c3
10ff827
4169e98
c04e844
0982e1c
e9cff87
85a933a
628156c
431fd80
e274c6a
b10f8e9
08db048
fc8e5c2
876bdeb
b223dd9
21fb838
743d886
17c8347
6d3f598
688cfad
6c903a9
0e961d5
04cbec5
e45046a
dffb451
4424974
369c6e6
5387aec
5c09e25
6b5850b
0278924
969bd12
8b675e4
4d7d256
3cb6f12
7741ba3
dae19d0
763e039
5f52c83
3da1e72
03133ba
61c32bf
ffa541f
eee3e2f
5058f5f
3d1f215
a14738d
07cce2a
68aceda
eee2541
10aa576
acdbe77
1197ce9
2ed92ad
6306b2b
59bc11e
0473e47
9bc41d8
fccca99
d451ad2
d9accde
c53a400
04caa20
d644313
050ebc0
c070ec1
b5178ea
e8a2c01
278e20b
cb35c74
bad3331
e4e4096
041c37f
e68ceb6
57b3fe1
14c9b3f
2bc18eb
160cb58
d71dc3a
a5ef29a
8b24400
a42d0dd
c398e6b
a6194b8
0dbe7fc
a906790
e1e7ec2
291eb7b
2e7c574
46d48bd
de51e89
17d3632
afe77bd
3e7a96f
7ef8f9e
0f18cd6
2e40225
d429c2f
f279b81
f639ce2
63c87ec
df1f364
dcf272a
8cd7564
0c35ea8
953fd4b
57abb0e
2afc839
0459b95
49613f8
df61a9e
64af8a7
cf40325
ae4a96a
da56e38
d650425
98f5364
3dc0e1f
a54a715
3d914da
7f98333
90210d8
0e5170d
c7d7bcb
5bc0dd6
7ca9d2d
fde596f
92099fe
4eb60bb
4662c86
a77934c
05b8185
fbffd1b
20a4fc9
ed51b0a
b6ebd6f
959ca25
6882294
964aec7
74dde5d
b4f8882
1d74f47
2714c76
5352ca8
5365cf9
59d82a0
cb0cd3b
2326ace
4243745
49f108e
c5f1a1b
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing