Resolve merge conflicts from #245 #267
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zbynek
force-pushed
the
resolve-conflict
branch
2 times, most recently
from
151cc6a
to
189e572
Compare
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
Signed-off-by: Zbynek Konecny <zbynek1729@gmail.com>
zbynek
force-pushed
the
resolve-conflict
branch
from
189e572
to
dfba32b
Compare
|
@zosrothko can you please merge this? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In #245 several commits were reverted. I hope this PR cherry-picks them all (I skipped the reverted ones).
@MarcMazas @zosrothko please check