Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: merge conflict issue in jupyter integration #319

Merged
merged 1 commit into from
Sep 30, 2024
Merged

fix: merge conflict issue in jupyter integration #319

merged 1 commit into from
Sep 30, 2024

Conversation

DanielSchiavini
Copy link
Collaborator

What I did

  • Fixed 2 issues that were raised by merge conflicts and incorrectly solved
    • The config object was introduced in 6c45246, but commit 517e7df missed this
    • The functions loadSigner and sendTransaction were deleted in 9307ce90 but then mistakenly reintroduced in the merge commit bbd1a6

How to verify it

  • Jupyter integration (outside colab) should work again

Cute Animal Picture

image

@DanielSchiavini DanielSchiavini marked this pull request as ready for review September 30, 2024 09:41
@charles-cooper charles-cooper merged commit f7b4fa8 into vyperlang:master Sep 30, 2024
9 checks passed
@DanielSchiavini DanielSchiavini deleted the jupyter branch September 30, 2024 18:35
Leminkay pushed a commit to Leminkay/titanoboa that referenced this pull request Oct 28, 2024
@DanielSchiavini @Leminkay
fix merge conflict issue in jupyter integration (vyperlang#319)
de65e11 
Fixed 2 issues that were raised by merge conflicts and incorrectly solved
- The config object was introduced in 6c45246, but commit 517e7df missed this
- The functions loadSigner and sendTransaction were deleted in 9307ce9 but then mistakenly reintroduced in the merge commit bbd1a6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charles-cooper charles-cooper charles-cooper approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DanielSchiavini @charles-cooper