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 conflict with development #551
Fix merge conflict with development #551
Changes from 1 commit
c4bb7cb
6316e00
696c22d
18955e8
ade2335
63f4cc8
d41a820
de72f36
b6d0590
aa43b09
3f2f332
ea24e51
3837492
63b5aee
97bd700
b6cc8c8
35fa792
380a168
a59348f
dbf4bbc
27e9bf4
af89e89
0bb2207
cc2d25b
369febc
c01ee05
6409b15
b93b3cb
b84b7d0
34a0a9b
22bf4bf
ce3b956
0859574
3ee8b34
a8a24d0
8c7ad2e
4113716
6189624
dc7f1f7
ce0fe8a
139bc18
a7e0458
2e51288
e19fe25
75164cd
8c6fcd0
fd3fb3e
6c50cd8
7704441
cdfa9ef
9de7e13
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing