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 sprint and resolve conflict to merge master #964
Fix sprint and resolve conflict to merge master #964
Changes from 27 commits
3b1546e
0969183
dbb2f40
03cbce3
a33dbe1
22e1ad9
4aab8ec
956b44f
4d7e3a5
708a874
e41e003
d710cf9
0529bc3
bf6c1c3
eab5ce8
3afc6cc
4af27d6
6bafdb5
fcc678b
4746502
7f702a0
4d43d7a
874eca1
b326c7c
1a35377
72849e2
e8727bd
bc0f706
cf6eccb
c89ad0b
df9e361
2e79a05
cf4f53d
227c1c6
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing