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
Resolved conflict #234
base: 3.x-dev
Are you sure you want to change the base?
Resolved conflict #234
Changes from 2 commits
08eef25
056c74a
4743c9c
d1aa560
5266da7
45b85d7
e1d5c11
7158d56
8cd7332
2731c12
bd47304
ca55e76
42491c8
2c2d90a
d068b5b
3b7d197
0886012
bd129ab
3867825
2b71546
46f6b24
15b815f
9c0d45b
c959b27
c9a855e
bd5800d
44a22c4
c79df20
dfdcca6
378ce79
f16b539
0e6bf62
7757f7d
e83ecd2
b5e76f5
5b28e19
5d26da8
35b08be
6cd28ec
852ce76
dcd37a7
eb513f9
a63ec8e
02f6f31
aa5ad84
8b2daa3
2c41497
15f37a1
1561003
7a3b826
f4ca58e
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing