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.

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

Added program json required by VSCode API changes #19

Merged
merged 4 commits into from
Jul 19, 2021
Merged

Added program json required by VSCode API changes #19

merged 4 commits into from
Jul 19, 2021

Conversation

wi-ry
Copy link
Contributor

@wi-ry wi-ry commented Feb 28, 2019

Comment on lines 91 to 92
<<<<<<< HEAD
=======
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a bunch of git merge conflicts

@zone117x
Copy link
Member

zone117x commented Jul 15, 2021

Thanks for working on this! Can you fix the git conflicts artifacts?

@wi-ry
Copy link
Contributor Author

wi-ry commented Jul 15, 2021

Wow. This is such an old PR... I've done my best to update this based on memory.

@wi-ry
Copy link
Contributor Author

wi-ry commented Jul 16, 2021

@zone117x Please check it now... Hopefully, it works. If not, just abandon the PR I guess, as we've switched over to using Hardhat now anyway, as Meadow wasn't compatible with newer versions of Solidity.

@zone117x zone117x merged commit 44cd71d into MeadowSuite:master Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants