Skip to content

Conversation

@OddCoincidence
Copy link
Contributor

For #293

@windelbouwman
Copy link
Contributor

@OddCoincidence thank you for your contribution, there appear to be some merge conflicts, could you take a look at those?

Copy link
Contributor

@windelbouwman windelbouwman left a comment

Choose a reason for hiding this comment

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

Please take a look at the merge conflicts, then we can merge this work.

@OddCoincidence
Copy link
Contributor Author

Conflicts resolved, and I also removed the direct uses of magic methods from the snippet as requested in #410

@windelbouwman windelbouwman merged commit ac37026 into RustPython:master Feb 9, 2019
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