Closed
Conversation
…en not android or env with PYODIDE, Fixes duckdb#63
Contributor
Author
|
Thanks @lnkuiper ! Do you think this will make it into |
|
@brianwyka It's not up to me to decide but if this gets merged within ~1 week or so, it will go into v1.2.0 |
Contributor
Author
|
Thanks! @hannes , can we get this into |
Contributor
Author
|
@lnkuiper , what is the best way to resolve this merge conflict? |
|
Hi @brianwyka, sorry for the inconvenience. Does re-generating the files help? i.e., |
Contributor
Author
I'll give that a try. |
86a81ed to
e252af1
Compare
Contributor
Author
|
Closing this out due to conflicts, replaced by #131 |
This file contains hidden or 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
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.
Fixes #63